From 4a74731ae649bdc3de418fae49b0d74ef16f8daa Mon Sep 17 00:00:00 2001
From: Artem Naluzhnyy <A.Naluzhnyy@samsung.com>
Date: Tue, 11 Jun 2019 15:30:58 +0200
Subject: Simplify "gerrit-maven-coverity" JJB template structure.

The commit does not change generated job.

Issue-ID: CIMAN-260

Signed-off-by: Artem Naluzhnyy <A.Naluzhnyy@samsung.com>
Change-Id: I136b233aa3811ab8e32327f8ab2b56d87ff13976
---
 jjb/ci-management/ci-management-coverity.yaml | 32 +++++++++------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index 399f7fa80..deae32af6 100644
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -1,21 +1,6 @@
 ---
 # Coverity Scan static analysis
 
-- builder:
-    name: onap-maven-coverity
-    builders:
-      - lf-maven-install:
-          mvn-version: '{mvn-version}'
-      - lf-update-java-alternatives:
-          java-version: '{java-version}'
-      - lf-provide-maven-settings:
-          global-settings-file: global-settings
-          settings-file: '{mvn-settings}'
-      - shell: !include-raw-escape:
-          - ../../global-jjb/shell/common-variables.sh
-          - ../../shell/maven-coverity.sh
-      - lf-provide-maven-settings-cleanup
-
 - job-template:
     name: '{project-name}-coverity'
     id: onap-gerrit-maven-coverity
@@ -27,7 +12,7 @@
     build-days-to-keep: 7
     build-timeout: 60
     cron: '@daily'
-    disable-job: false
+    disabled: false
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
@@ -48,8 +33,6 @@
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
 
-    disabled: '{disable-job}'
-
     properties:
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -94,10 +77,17 @@
 
     builders:
       - lf-infra-pre-build
-      - onap-maven-coverity:
-          java-version: '{java-version}'
-          mvn-settings: '{mvn-settings}'
+      - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - lf-provide-maven-settings:
+          global-settings-file: global-settings
+          settings-file: '{mvn-settings}'
+      - shell: !include-raw-escape:
+          - ../../global-jjb/shell/common-variables.sh
+          - ../../shell/maven-coverity.sh
+      - lf-provide-maven-settings-cleanup
 
     publishers:
       - lf-infra-publish
-- 
cgit 1.2.3-korg