engine: Set deploy scenario and create k8s 1.16 jobs

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

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
index 5d395d91842d8f1b89121a10bf2eb2681d261f94..153776bd8d2cfeac3d7d534fc04b76ff42de5658 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
@@ -22,9 +22,12 @@
 
     project: 'kubernetes-verify-package'
 
+    # 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'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
@@ -32,8 +35,9 @@
           failed: false
           unstable: false
           notbuilt: false
-      - '1.17':
-          branch: '{stream}'
+          deploy-scenario: 'k8-multus-plugins'
+      - '1_17':
+          branch: '1.17'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
@@ -41,8 +45,9 @@
           failed: false
           unstable: false
           notbuilt: false
-      - '1.15':
-          branch: '{stream}'
+          deploy-scenario: 'k8-multus-plugins'
+      - '1_16':
+          branch: '1.16'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
@@ -50,6 +55,17 @@
           failed: false
           unstable: false
           notbuilt: false
+          deploy-scenario: 'k8-calico-nofeature'
+      - '1_15':
+          branch: '1.15'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
+          execution-mode: 'packaging'
+          gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+          deploy-scenario: 'k8-calico-nofeature'
 
     distro:
       - ubuntu1804
@@ -68,6 +84,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: EXECUTION_MODE
           default: '{execution-mode}'
@@ -96,18 +116,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-package-.*'
-            - 'kubernetes-verify-package-.*'
-            - 'onap-verify-package-.*'
-            - 'openstack-verify-package-.*'
-          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: 4
+          option: category
+          categories:
+            - engine-verify-package
 
     scm:
       - git-scm-gerrit: