X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-scenario.yaml;h=a0253d4aeeb923b79bceadd682bd809c75c37f03;hb=cde0f9dece6d879e7a4313bd902eec4aa14465e1;hp=3e8d9fb3ec08c97cea91ac511de48706423c7f48;hpb=3a8a772eb897a2f18a584e45b430ae84736dd359;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index 3e8d9fb3..a0253d4a 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -45,19 +45,11 @@
           branch: '{stream}'
           disabled: 'false'
 
-    os:
+    distro:
       - ubuntu1804:
           disabled: 'false'
-          distribution: 'ubuntu18'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: 'bionic'
-          dib_os_element: 'ubuntu-minimal'
       - centos7:
           disabled: 'true'
-          distribution: 'centos7'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: '7'
-          dib_os_element: 'centos-minimal'
 
     deploy-scenario:
       - k8-calico-nofeature:
@@ -70,6 +62,8 @@
           installer-type: kubespray
       - k8-weave-nofeature:
           installer-type: kubespray
+      - k8-multus-nofeature:
+          installer-type: kubespray
 
     type:
       - baremetal:
@@ -87,11 +81,11 @@
           build-timeout: 5
 
     jobs:
-      - '{deploy-scenario}-periodic-{os}-{type}-{stream}'
-      - '{deploy-scenario}-periodic-{os}-{phase}-{type}-{stream}'
+      - '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
+      - 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{os}-{type}-{stream}'
+    name: '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
 
     project-type: multijob
 
@@ -109,8 +103,8 @@
           default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
-          name: DISTRIBUTION
-          default: '{distribution}'
+          name: DISTRO
+          default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: DEPLOY_TYPE
@@ -120,18 +114,6 @@
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
-      - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: '{ipa_dib_os_element}'
-          description: 'DIB OS Element to use for building the ramdisk image'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib_os_release}'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib_os_element}'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
       - string:
           name: INSTALLER_TYPE
           default: '{installer-type}'
@@ -158,7 +140,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-periodic-engine-{os}-.*'
+            - 'cloud-infra-periodic-engine-{distro}-.*'
             - 'k8-.*?-periodic-.*'
           block-level: 'NODE'
       - throttle:
@@ -187,15 +169,12 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: '{deploy-scenario}-periodic-{os}-deploy-{type}-{stream}'
+            - name: 'scenario-periodic-{distro}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 CLEANUP=$CLEANUP
@@ -205,12 +184,12 @@
               abort-all-job: true
       - multijob:
           name: functest
-          condition: ALWAYS
+          condition: SUCCESSFUL
           projects:
-            - name: '{deploy-scenario}-periodic-{os}-functest-{type}-{stream}'
+            - name: 'scenario-periodic-{distro}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -222,12 +201,12 @@
               abort-all-job: true
       - multijob:
           name: yardstick
-          condition: ALWAYS
+          condition: SUCCESSFUL
           projects:
-            - name: '{deploy-scenario}-periodic-{os}-yardstick-{type}-{stream}'
+            - name: 'scenario-periodic-{distro}-yardstick-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -239,12 +218,12 @@
               abort-all-job: true
       - multijob:
           name: promote
-          condition: ALWAYS
+          condition: SUCCESSFUL
           projects:
-            - name: '{deploy-scenario}-periodic-{os}-promote-{type}-{stream}'
+            - name: 'scenario-periodic-{distro}-promote-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -256,7 +235,7 @@
               abort-all-job: true
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{os}-{phase}-{type}-{stream}'
+    name: 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -270,8 +249,8 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRIBUTION
-          default: 'ubuntu18'
+          name: DISTRO
+          default: 'ubuntu1804'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
       - string:
           name: DEPLOY_TYPE
@@ -281,18 +260,6 @@
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'false'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
-      - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: 'fedora'
-          description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_RELEASE
-          default: 'bionic'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: 'ubuntu-minimal'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
       - string:
           name: ENGINE_ANSIBLE_PARAMS
           default: ' -v '