X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-scenario.yaml;h=fae205870814ce7496467dcd9f75446dbfbcaf40;hb=f6d92e9bc27e865592a14b06a269d6f14ea21bbf;hp=fa473125e8eea728488b3007de27639d465c1f67;hpb=569dfcaaaa0112b0f460689a58c1303936490a55;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index fa473125..fae20587 100644
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -47,15 +47,20 @@
     stream:
       - 'master':
           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'
+          disabled: false
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+      - centos7:
+          disabled: true
+          successful: true
+          failed: true
+          unstable: true
+          notbuilt: true
 
     type:
       - virtual:
@@ -68,11 +73,11 @@
           build-timeout: 30
 
     jobs:
-      - 'cloud-infra-verify-scenario-{os}-{type}-{stream}'
-      - 'cloud-infra-verify-scenario-{os}-{phase}-{type}-{stream}'
+      - 'cloud-infra-verify-scenario-{distro}-{type}-{stream}'
+      - 'cloud-infra-verify-scenario-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-verify-scenario-{os}-{type}-{stream}'
+    name: 'cloud-infra-verify-scenario-{distro}-{type}-{stream}'
 
     project-type: multijob
 
@@ -90,8 +95,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
@@ -101,18 +106,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: TEST_SUITE
           default: 'healthcheck'
@@ -127,11 +120,10 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{os}-.*'
-            - 'cloud-infra-verify-scenario-{os}-.*'
-            - 'cloud-infra-periodic-engine-{os}-.*'
-            - 'cloud-infra-os-.*'
-            - 'cloud-infra-k8-.*'
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
+            - 'cloud-infra-periodic-engine-.*'
+            - 'k8-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -148,12 +140,20 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
       - nordix-gerrit-trigger-patchset-created:
           project: 'infra\/swconfig'
           branch: '{branch}'
           files: '**'
+          custom-url: '* $JOB_NAME $BUILD_URL'
+          skip-vote:
+            successful: '{obj:successful}'
+            failed: '{obj:failed}'
+            unstable: '{obj:unstable}'
+            notbuilt: '{obj:notbuilt}'
 
     builders:
       - 'cloud-infra-determine-scenario-macro'
@@ -161,15 +161,12 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-scenario-{os}-deploy-{type}-{stream}'
+            - name: 'cloud-infra-verify-scenario-{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
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -183,15 +180,12 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-scenario-{os}-functest-{type}-{stream}'
+            - name: 'cloud-infra-verify-scenario-{distro}-functest-{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
                 TEST_SUITE=$TEST_SUITE
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
@@ -204,7 +198,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'cloud-infra-verify-scenario-{os}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-verify-scenario-{distro}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -218,8 +212,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
@@ -229,18 +223,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: TEST_FW
           default: '{phase}'
@@ -271,6 +253,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     builders:
       - 'cloud-infra-determine-scenario-macro'