X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-testfw.yaml;h=e169b69ca89e068a0a3c32d8b4dae49cf3c96ff8;hb=c712a602bad0b999f4f6f1736b6b3872934e6f9c;hp=fbad9e8b2dcbb45187eb4f321f89d181dae7394b;hpb=0c0e67aaf375e2e26e3cfa97037d628e4a96c122;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 fbad9e8b..e169b69c 100644
--- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@ -52,13 +52,9 @@
           branch: '{stream}'
           disabled: 'false'
 
-    os:
+    distro:
       - ubuntu1804:
           disabled: 'false'
-          distribution: 'ubuntu18'
-      - centos7:
-          disabled: 'true'
-          distribution: 'centos7'
 
     type:
       - virtual
@@ -68,11 +64,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,12 +83,16 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-test-{os}'
+          default: 'vpod-test-{distro}'
           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
+          default: '{type}'
+          description: 'Type of the deployment'
       - string:
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
@@ -101,6 +101,10 @@
           name: TEST_SUITE
           default: 'healthcheck'
           description: 'Test suite to run'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: CLEANUP
           default: 'true'
@@ -111,7 +115,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-testfw-{os}-.*'
+            - 'cloud-infra-verify-testfw-{distro}-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -140,12 +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
@@ -159,12 +164,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
@@ -176,7 +183,7 @@
               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
 
@@ -190,9 +197,13 @@
           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
+          default: 'virtual'
+          description: 'Type of the deployment. Overriden by upstream job.'
       - string:
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
@@ -209,6 +220,10 @@
           name: TEST_REPO_URL
           default: 'https://gerrit.nordix.org/infra/test.git'
           description: 'URL to Nordix Cloud Infra test repository'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: CLEANUP
           default: 'false'