engine: Set deploy scenario and create k8s 1.16 jobs

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

diff --git a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
index 9d32b986829be9a492aa42382187fcc69f7700db..c34477e0452ff72337be79af755c40b6b87fb432 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
@@ -25,10 +25,13 @@
     stream:
       - 'master':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
       - 'frankfurt':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
       - 'elalto':
           branch: '{stream}'
+          deploy-scenario: 'onap-sdc-full'
 
     environment-type:
       - online:
@@ -82,6 +85,14 @@
     concurrent: true
 
     parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{deploy-scenario}'
+          description: 'Scenario to test change with.'
+      - 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'
@@ -253,7 +264,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-master'
+            - name: 'onap-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: true
               node-parameters: true
@@ -265,7 +276,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'onap-verify-{environment-type}-functest-{distro}-city-{type}-master'
+            - name: 'onap-verify-{environment-type}-functest-{distro}-city-{type}-{stream}'
               current-parameters: true
               git-revision: false
               node-parameters: true