engine: Set deploy scenario and create k8s 1.16 jobs

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

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
index 2c192ba35fe6ad720b6d1da20b60c45f6282b681..0e64c81c7649ea454e9a9d9a08f1e1973688454e 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
@@ -22,15 +22,21 @@
 
     project: 'kubernetes-tox'
 
+    # 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}'
+          branch: 'master'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
-      - '1.17':
-          branch: '{stream}'
+      - '1_17':
+          branch: '1.17'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
-      - '1.15':
-          branch: '{stream}'
+      - '1_16':
+          branch: '1.16'
+          gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
+      - '1_15':
+          branch: '1.15'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
 
     lint-type:
@@ -70,6 +76,14 @@
 
     properties:
       - logrotate
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-tox
 
     wrappers:
       - build-timeout: