engine: Set deploy scenario and create k8s 1.16 jobs

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

diff --git a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
index d492e5786dbe2012cf1f28ffdf1783885ebc053b..5841d392ffe62d0bd710230f7df8b8404f5e58b4 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
@@ -25,10 +25,13 @@
     stream:
       - 'master':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
       - 'train':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
       - 'stein':
           branch: '{stream}'
+          deploy-scenario: 'os-nosdn-nofeature'
 
     environment-type:
       - online:
@@ -82,6 +85,10 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -257,7 +264,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'openstack-verify-{environment-type}-deploy-{distro}-city-{type}-master'
+            - name: 'openstack-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
@@ -269,7 +276,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'openstack-verify-{environment-type}-functest-{distro}-city-{type}-master'
+            - name: 'openstack-verify-{environment-type}-functest-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: false
               node-parameters: true