engine: Update command line arguments to engine

[infra/cicd.git] / jjb / engine / verify-jobs / kubernetes-verify-deploy-test.yaml

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
index 658f80ab504523697f0661c1513ce81fa16741ef..45e5f413311a639a38f888d1a92929e9cbe93f81 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@ -22,13 +22,16 @@
 
     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'
+      - '1_17':
+          branch: '1.17'
+      - '1_15':
+          branch: '1.15'
 
     environment-type:
       - online:
@@ -88,6 +91,10 @@
     concurrent: true
 
     parameters:
+      - 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 +167,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: