Fix gerrit parameters and add installer type to job name

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-onap.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index bdb313da0f571bf180bd94fc0d5a8851f83c1819..e26a7f1f9bbac7c42f5b8a76e50f39cef581d6ff 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -50,18 +50,27 @@
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           disabled: false
+      - 'master':
+          nordix-branch: master
+          onap-version: master
+          onap-flavor: full
+          engine-version: master
+          engine-refspec: master
+          deploy-scenario-version: master
+          deploy-scenario-refspec: master
+          disabled: true
 
     distro:
       - ubuntu1804:
           disabled: 'false'
 
     deploy-scenario:
-      - onap-oom-nofeature:
-          installer-type: kubespray
+      - onap-oom-nofeature
 
     type:
       - cloud:
           provisioner-type: heat
+          installer-type: kubespray
           slave-label: 'jumphost-onap-ubuntu1804'
 
     phase:
@@ -75,11 +84,11 @@
           build-timeout: 5
 
     jobs:
-      - '{deploy-scenario}-periodic-{distro}-{type}-{onap-branch}'
-      - '{phase}-periodic-{distro}-{type}-{onap-branch}'
+      - '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+      - '{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{distro}-{type}-{onap-branch}'
+    name: '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
 
     project-type: multijob
 
@@ -91,6 +100,7 @@
       - project-parameters:
           project: '{project}'
           branch: '{nordix-branch}'
+      - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
@@ -194,7 +204,7 @@
           name: Deploy ONAP
           condition: SUCCESSFUL
           projects:
-            - name: 'onap-deploy-periodic-{distro}-{type}-{onap-branch}'
+            - name: 'onap-deploy-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -220,7 +230,7 @@
           name: OOM Healthcheck
           condition: SUCCESSFUL
           projects:
-            - name: 'oom-healthcheck-periodic-{distro}-{type}-{onap-branch}'
+            - name: 'oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -245,7 +255,7 @@
           name: ONAP Healthcheck
           condition: SUCCESSFUL
           projects:
-            - name: 'onap-healthcheck-periodic-{distro}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -271,7 +281,7 @@
           name: Promote ONAP
           condition: SUCCESSFUL
           projects:
-            - name: 'promote-onap-periodic-{distro}-{type}-{onap-branch}'
+            - name: 'promote-onap-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -293,7 +303,7 @@
               abort-all-job: false
 
 - job-template:
-    name: '{phase}-periodic-{distro}-{type}-{onap-branch}'
+    name: '{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
 
     disabled: false
 
@@ -306,6 +316,7 @@
       - project-parameters:
           project: '{project}'
           branch: '{nordix-branch}'
+      - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
           default: 'jumphost-onap-ubuntu1804'