engine: Set deploy scenario and create k8s 1.16 jobs

[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 45e5f413311a639a38f888d1a92929e9cbe93f81..cab7e12d2e4eacd7ad8e1b47bb6cdf37d38c5b52 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@ -28,10 +28,16 @@
     stream:
       - 'master':
           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:
@@ -91,6 +97,10 @@
     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}'
@@ -266,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
@@ -278,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