Merge "POLICY-Refactor CLM project block"

diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index 69aadc8..9f9bdf9 100644 (file)
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -44,6 +44,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - shell: '{script}'
 
     publishers:
@@ -93,6 +94,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 8d1c40d..3052dc2 100644 (file)
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -100,6 +100,7 @@
     <<: *docker_merge_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -140,6 +141,7 @@
     <<: *docker_merge_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -185,6 +187,7 @@
     <<: *docker_verify_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -227,6 +230,7 @@
     <<: *docker_verify_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -277,6 +281,7 @@
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -335,6 +340,7 @@
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -379,6 +385,7 @@
     <<: *docker_merge_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -416,6 +423,7 @@
     <<: *docker_merge_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -461,6 +469,7 @@
     <<: *docker_verify_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -499,6 +508,7 @@
     <<: *docker_verify_boiler_plate
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -549,6 +559,7 @@
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -607,6 +618,7 @@
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -662,6 +674,7 @@
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -712,6 +725,7 @@
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-docker-login:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index a3182cc..e891e92 100644 (file)
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -45,6 +45,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -104,6 +105,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -159,6 +161,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -169,4 +172,4 @@
 
     publishers:
       - infra-shiplogs:
-          maven-version: '{maven-version}'
\ No newline at end of file
+          maven-version: '{maven-version}'

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 79a0077..664d14e 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -67,6 +67,7 @@
           files: '{files}'
 
     builders:
+      - lf-infra-pre-build
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -90,6 +91,7 @@
           files: '{files}'
 
     builders:
+      - lf-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -124,6 +126,7 @@
                 comment-contains-value: '^stage-helm$'
 
     builders:
+      - lf-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -145,6 +148,7 @@
 
     disabled: true
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -157,6 +161,7 @@
 
     disabled: true
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -180,6 +185,7 @@
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 8f17a25..61da2d5 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -49,6 +49,7 @@
           files: '{obj:pattern}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -150,6 +151,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -217,6 +219,7 @@
           project: '{project}'
           branch: '{branch}'
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -293,6 +296,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -367,6 +371,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -444,6 +449,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -517,6 +523,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -594,6 +601,7 @@
           files: '{pattern}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -640,6 +648,7 @@
     name: '{project-name}-{stream}-merge-profile-java'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -724,7 +733,7 @@
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -809,6 +818,7 @@
           project: '{project}'
           branch: '{branch}'
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -883,7 +893,7 @@
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -951,7 +961,7 @@
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -1021,7 +1031,7 @@
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -1099,7 +1109,7 @@
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -1180,7 +1190,7 @@
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -1278,7 +1288,7 @@
           branch: '{branch}'
 
     builders:
-
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -1330,6 +1340,7 @@
     build-timeout: 120
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 80ae84b..b30af0e 100644 (file)
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -53,6 +53,7 @@
           files: '{pattern}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -137,6 +138,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 9264bc9..fcbf745 100644 (file)
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -47,6 +47,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -122,6 +123,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -193,6 +195,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -260,6 +263,7 @@
           branch: '{branch}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -315,6 +319,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml
new file mode 100644 (file)
index 0000000..1094631
--- /dev/null
+++ b/jjb/multicloud/multicloud-azure-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: multicloud-azure-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'multicloud-azure'
+    stream: 'master'
+    functionality:
+      - 'functionality1':
+          trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index f9e94f9..b4590be 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -12,7 +12,6 @@
           pom: 'azure/pom.xml'
           pattern: 'azure/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
     mvn-settings: 'multicloud-azure-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-azure-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: multicloud/azure
+    project-name: 'multicloud-azure'
+    branch: 'master'
+    mvn-settings: 'multicloud-azure-settings'

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 8f20092..8da6ac9 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -12,7 +12,6 @@
           pom: 'multivimbroker/pom.xml'
           pattern: 'multivimbroker/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-framework-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: multicloud/framework
+    project-name: 'multicloud-framework'
+    branch: 'master'
+    mvn-settings: 'multicloud-framework-settings'

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 00f6d02..0743a24 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -12,7 +12,6 @@
           pom: 'vio/pom.xml'
           pattern: 'vio/**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
     mvn-settings: 'multicloud-openstack-vmware-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-openstack-vmware-java-clm
+    jobs:
+      - gerrit-maven-clm
+    project: multicloud/openstack/vmware
+    project-name: 'multicloud-openstack-vmware'
+    branch: 'master'
+    mvn-settings: 'multicloud-openstack-vmware-settings'

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index d6cc74d..0ff1cc5 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -37,7 +37,6 @@
           pattern: 'windriver/**'
           pom: 'windriver/pom.xml'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
@@ -106,3 +105,13 @@
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-openstack-clm
+    jobs:
+      - gerrit-maven-clm
+    project: multicloud/openstack
+    project-name: 'multicloud-openstack'
+    build-node: ubuntu1604-memcached-4c-4g
+    branch: 'master'
+    mvn-settings: 'multicloud-openstack-settings'

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 788e752..39253cd 100644 (file)
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -39,7 +39,8 @@
 - project:
     name: optf-cmso-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
     cron: 'H 11 * * *'
     build-node: ubuntu1604-docker-8c-8g
     project: 'optf/cmso'