X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fverify-jobs%2Fkubernetes-verify-deploy-test.yaml;h=cab7e12d2e4eacd7ad8e1b47bb6cdf37d38c5b52;hb=f2b51873a346fec4e1709c4bf3e60dff76431c12;hp=658f80ab504523697f0661c1513ce81fa16741ef;hpb=d8b7f143c9bd074fd65e6e5c93edc221164702f7;p=infra%2Fcicd.git

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
index 658f80ab..cab7e12d 100644
--- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@ -22,13 +22,22 @@
 
     project: 'kubernetes-verify-deploy-test'
 
+    # NOTE (fdegir): dot is not an allowed character in groovy var names and also for
+    # naming openstack objects so stream is used for that purpose but branch points to
+    # actual branch name on gerrit
     stream:
       - 'master':
-          branch: '{stream}'
-      - '1.17':
-          branch: '{stream}'
-      - '1.15':
-          branch: '{stream}'
+          branch: 'master'
+          deploy-scenario: 'k8-multus-plugins'
+      - '1_17':
+          branch: '1.17'
+          deploy-scenario: 'k8-multus-plugins'
+      - '1_16':
+          branch: '1.16'
+          deploy-scenario: 'k8-calico-nofeature'
+      - '1_15':
+          branch: '1.15'
+          deploy-scenario: 'k8-calico-nofeature'
 
     environment-type:
       - online:
@@ -88,6 +97,14 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with. This depends on the branch of the stack'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-{environment-type}-{distro}-fra'
@@ -160,16 +177,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '.*?-verify-online-deploy-test-.*'
-            - '.*?-verify-offline-deploy-test-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 8
+          option: category
+          categories:
+            - engine-verify-deploy-test
 
     scm:
       - git-scm-gerrit:
@@ -261,7 +276,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'kubernetes-verify-{environment-type}-deploy-{distro}-city-{type}-master'
+            - name: 'kubernetes-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
@@ -273,7 +288,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'kubernetes-verify-{environment-type}-functest-{distro}-city-{type}-master'
+            - name: 'kubernetes-verify-{environment-type}-functest-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: false
               node-parameters: true