cloud-infra: Disable all jobs

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-verify-testfw.yaml

diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index ba7880fd3e1be82dc993e2666cf9954e77402ed7..92faf67c7438aab4ee748e86e76918e60e1c84fd 100644 (file)
--- 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
@@ -106,16 +103,17 @@
           default: 'healthcheck'
           description: 'Test suite to run'
       - string:
-          name: CLEANUP
-          default: 'true'
-          description: 'Cleanup leftovers of the previous run'
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
 
     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
@@ -132,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:
@@ -144,13 +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
-                CLEANUP=$CLEANUP
+                YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -163,14 +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
-                CLEANUP=$CLEANUP
+                YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -181,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
 
@@ -195,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
@@ -219,8 +219,9 @@
           default: 'https://gerrit.nordix.org/infra/test.git'
           description: 'URL to Nordix Cloud Infra test repository'
       - string:
-          name: CLEANUP
-          default: 'false'
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
 
     wrappers:
       - build-timeout:
@@ -232,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'