X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-testfw.yaml;h=92faf67c7438aab4ee748e86e76918e60e1c84fd;hb=2201fe96ae3a8cb55820a62578aa1d7b1ebea6a1;hp=2f76b720d1b8f360f6aaf401631ad36cd07b7857;hpb=3df67603404deb50e90a0171e47770729451a7ba;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index 2f76b720..92faf67c 100644
--- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@ -50,15 +50,12 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: 'false'
+          disabled: 'true'
 
-    os:
+    distro:
       - ubuntu1804:
-          disabled: 'false'
-          distribution: 'ubuntu18'
-      - centos7:
           disabled: 'true'
-          distribution: 'centos7'
+          slave-label: vpod-test-ubuntu1804
 
     type:
       - virtual
@@ -68,11 +65,11 @@
       - yardstick
 
     jobs:
-      - 'cloud-infra-verify-testfw-{os}-{type}-{stream}'
-      - 'cloud-infra-verify-testfw-{os}-{phase}-{type}-{stream}'
+      - 'cloud-infra-verify-testfw-{distro}-{type}-{stream}'
+      - 'cloud-infra-verify-testfw-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-verify-testfw-{os}-{type}-{stream}'
+    name: 'cloud-infra-verify-testfw-{distro}-{type}-{stream}'
 
     project-type: multijob
 
@@ -87,11 +84,11 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-test-{os}'
+          default: '{slave-label}'
           description: 'Slave label to schedule this job on. These slaves have cloud infra installed on them.'
       - string:
-          name: DISTRIBUTION
-          default: '{distribution}'
+          name: DISTRO
+          default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: DEPLOY_TYPE
@@ -109,17 +106,14 @@
           name: YARDSTICK_DISPATCHER
           default: 'file'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'true'
-          description: 'Cleanup leftovers of the previous run'
 
     properties:
       - logrotate
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-testfw-{os}-.*'
+            - 'cloud-infra-verify-testfw-{distro}-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -136,6 +130,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
       - nordix-gerrit-trigger-patchset-created:
@@ -148,14 +144,13 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-testfw-{os}-functest-{type}-{stream}'
+            - name: 'cloud-infra-verify-testfw-{distro}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -168,15 +163,14 @@
           name: yardstick
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-testfw-{os}-yardstick-{type}-{stream}'
+            - name: 'cloud-infra-verify-testfw-{distro}-yardstick-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -187,9 +181,9 @@
               abort-all-job: true
 
 - job-template:
-    name: 'cloud-infra-verify-testfw-{os}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-verify-testfw-{distro}-{phase}-{type}-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
@@ -201,8 +195,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
@@ -228,9 +222,6 @@
           name: YARDSTICK_DISPATCHER
           default: 'file'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'false'
 
     wrappers:
       - build-timeout:
@@ -242,6 +233,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     builders:
       - 'cloud-infra-testfw-macro'