Refactor!: JJB code comply with updates to v5.x

Update global-jjb v0.86.0, this updates the minimal
version of JJB to v5.0.2.

Issue-ID: CIMAN-33
Change-Id: I26089604b401a8b486d752a4780b1981788d19ad
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/global-jjb b/global-jjb
index ac8fb0e..de13320 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit ac8fb0e75cdcbeb4812e620ecc68f9631b90e507
+Subproject commit de13320dea5c46324937b12f69435e082e4edf0b

diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml
index 66c2968..8986c69 100644 (file)
--- a/jjb/ci-management/ci-management-views.yaml
+++ b/jjb/ci-management/ci-management-views.yaml
@@ -1,5 +1,5 @@
 ---
-- releng_view: &releng_view_common
+- _releng_view: &releng_view_common
     name: releng-view-common
     view-type: list
     filter-executors: false

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 9a64462..863e1de 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -58,7 +58,7 @@
     project-name: ci-management
     branch: master
     archive-artifacts: '**/*.log'
-    jenkins-ssh-credential: "{jenkins-ssh-credential}"
+    jenkins-ssh-credential: onap-jenkins-ssh
 
     build-node: centos8-builder-2c-1g
     # update-cloud-image: true

diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 634d1d8..6b87670 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -36,7 +36,6 @@
     #      - dcaegen2-docker-python-jobs
 
     name: '{project-name}-docker-python-jobs'
-    id: dcaegen2-services-docker-python-jobs
     container-tag-method: latest
     docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh'
     nexus-iq-namespace: 'onap-'
@@ -69,17 +68,6 @@
               docker push $DNAME:latest
           stream: master
           branch: master
-      - gerrit-docker-merge-maintainance:
-          post_docker_build_script: |
-              #!/bin/bash
-              set -uex -o pipefail
-              DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}}
-              DNAME={container-snapshot-registry}/{docker-name}
-              docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2
-              docker push $DNAME:$DOCKER_IMAGE_TAG2
-          stream: kohn
-          branch: kohn
-          cron: ''
       - gerrit-tox-sonar:
           # workaround because gerrit-tox-sonar doesn't support mvn-params/opts
           sonar-mvn-goal: '-f {src-dir}/pom.xml sonar:sonar'
@@ -96,6 +84,20 @@
       - dcaegen2-services-pmsh:
           src-dir: components/pm-subscription-handler
           docker-name: onap/org.onap.dcaegen2.services.pmsh
+    stream:
+      - master:
+          branch: master
+      - kohn:
+          branch: kohn
+    jobs:
+      - '{project-name}-docker-python-jobs'
+
+- project:
+    name: dcaegen2-services-ml
+    project: dcaegen2/services
+    mvn-settings: dcaegen2-services-settings
+    build-node: ubuntu1804-docker-8c-8g
+    project-name:
       - dcaegen2-services-ml-prediction-ms:
           src-dir: components/ml-prediction-ms
           docker-name: onap/org.onap.dcaegen2.services.ml-prediction-ms
@@ -104,8 +106,11 @@
           branch: master
       - kohn:
           branch: kohn
+    jobs:
+      - '{project-name}-docker-python-jobs'
+
+- project:
+    name: dcaegen2-services-subprojects-view
     views:
       - project-view:
           project-name: dcaegen2-services-pmsh
-    jobs:
-      - dcaegen2-services-docker-python-jobs

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 55a5bb4..6833c65 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -65,7 +65,7 @@
     project: dcaegen2/utils
     branch: master
 
-- cbs_client_pypi_common: &cbs_client_pypi_common
+- _cbs_client_pypi_common: &cbs_client_pypi_common
     name: cbs-client-pypi-common
     # jenkins job prefix
     project-name: dcaegen2-platform-cbs-client

diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index f78cce7..ac841a5 100644 (file)
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -3,7 +3,7 @@
 # COMMON FUNCTIONS #
 ####################
 
-- c_job_common: &c_job_common
+- _c_job_common: &c_job_common
     name: c-job-common
 
     ######################

diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 23a554b..5380bde 100644 (file)
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -2,7 +2,7 @@
 ###########
 # ANCHORS #
 ###########
-- docker_job_boiler_plate: &docker_job_boiler_plate
+- _docker_job_boiler_plate: &docker_job_boiler_plate
     name: docker_job_boiler_plate
 
     project-type: freestyle
@@ -50,7 +50,7 @@
     publishers:
       - lf-infra-publish
 
-- docker_verify_boiler_plate: &docker_verify_boiler_plate
+- _docker_verify_boiler_plate: &docker_verify_boiler_plate
     name: docker_verify_boiler_plate
 
     concurrent: true
@@ -69,7 +69,7 @@
           branch: '{branch}'
           files: '{files}'
 
-- docker_merge_boiler_plate: &docker_merge_boiler_plate
+- _docker_merge_boiler_plate: &docker_merge_boiler_plate
     name: docker_merge_boiler_plate
 
     scm:

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 7b74b0e..98a67b8 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -20,7 +20,7 @@
 ###########
 # ANCHORS #
 ###########
-- helm_job_boiler_plate: &helm_job_boiler_plate
+- _helm_job_boiler_plate: &helm_job_boiler_plate
     name: helm_job_boiler_plate
 
     ######################

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index ff021db..f9da82c 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -150,7 +150,7 @@
     name: '{project-name}-{stream}-release-java-daily-checkstyle'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -221,7 +221,7 @@
     name: '{project-name}-{stream}-release-version-java-daily'
 
     project-type: freestyle
-    disabled: '{disabled}'
+    disabled: false
     node: '{build-node}'
     maven-deploy-properties:
     properties:
@@ -448,7 +448,7 @@
     id: '{project-name}-{stream}-docker-java-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     java-version: openjdk8
     properties:
       - infra-properties:
@@ -537,7 +537,7 @@
     name: '{project-name}-{stream}-docker-java-shell-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -604,7 +604,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-java-shell-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -673,7 +673,7 @@
     name: '{project-name}-{stream}-docker-java-version-shell-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -750,7 +750,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
     node: 'ubuntu1804-docker-8c-8g'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -828,7 +828,7 @@
     id: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -925,7 +925,7 @@
     project-type: freestyle
     node: '{build-node}'
     docker-image-name: ''
-    disabled: '{disabled}'
+    disabled: false
     java-version: 'openjdk8'
     properties:
       - infra-properties:

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 99445da..8013af2 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -1,7 +1,7 @@
 ---
 - job-template:
     name: '{project-name}-{stream}-verify-csit-{functionality}'
-    disabled: '{disabled}'
+    disabled: false
 
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -64,7 +64,7 @@
 
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
-    disabled: '{disabled}'
+    disabled: false
 
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -129,7 +129,7 @@
           notify-every-unstable-build: false
           send-to-individuals: true
 
-- verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
+- _verification_maven_job_boiler_plate: &verification_maven_job_boiler_plate
     name: verification_maven_job_boiler_plate
 
     ######################
@@ -157,7 +157,7 @@
     submodule-timeout: 10
     submodule-disable: false
 
-    disabled: '{disabled}'
+    disabled: false
     archive-artifacts: >
       **/*.log
       **/hs_err_*.log

diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
index fac5181..bb2c375 100644 (file)
--- a/jjb/lf-infra-releasedockerhub.yaml
+++ b/jjb/lf-infra-releasedockerhub.yaml
@@ -64,5 +64,5 @@
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: 'onap-releasedockerhub-authz-settings'
-      - lf-onap-releasedockerhub-macro:
+      - lf-onap-releasedockerhub-macro
 

diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml
index 9de048c..7294ee6 100644 (file)
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -1,6 +1,6 @@
 ---
 # Job definition Anchors
-- pypi_job_boiler_plate: &pypi_job_boiler_plate
+- _pypi_job_boiler_plate: &pypi_job_boiler_plate
     name: pypi_job_boiler_plate
 
     #####################

diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index ee37054..e36b6d2 100644 (file)
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: '{project-name}-{stream}-project-csit-{functionality}'
-    disabled: '{disabled}'
+    disabled: false
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
     node: '{build-node}'
@@ -56,7 +56,7 @@
 
 - job-template:
     name: '{project-name}-{stream}-project-csit-verify-{functionality}'
-    disabled: '{disabled}'
+    disabled: false
 
     project-type: freestyle
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -115,7 +115,7 @@
 
 - job-template:
       name: '{project-name}-{stream}-project-k8s-csit-{functionality}'
-      disabled: '{disabled}'
+      disabled: false
       project-type: freestyle
       build-node: 'ubuntu1804-docker-8c-8g'
       node: '{build-node}'
@@ -172,7 +172,7 @@
 
 - job-template:
       name: '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
-      disabled: '{disabled}'
+      disabled: false
 
       project-type: freestyle
       build-node: 'ubuntu1804-docker-8c-8g'