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=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..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,11 +83,11 @@
       - 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
@@ -119,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
@@ -148,10 +144,10 @@
           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
@@ -168,10 +164,10 @@
           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
@@ -187,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
 
@@ -201,8 +197,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