Merge "Add support for ONAP testing in verify jobs"

[infra/cicd.git] / jjb / cloud-infra / onap-jobs / onap-release-jobs.yaml

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
index 3909f642a6fc39e732e749c01ea127f972b69fe9..c054a09a0f0e431fe28bb50e21471709b23490c6 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
@@ -22,25 +22,36 @@
 
     project: 'ONAP-release'
 
+
     stream:
       - 'master':
           branch: 'master'
           oom_branch: 'master'
-          deploy-scenario: 'onap-sdc-nofeature'
+          deploy-scenario: 'onap-full-nofeature'
           k8s-version: '1.15'
           promote-stack: 'false'
+          container-tool: 'docker'
+      - 'guilin':
+          branch: 'guilin'
+          oom_branch: 'master'
+          deploy-scenario: 'onap-full-nofeature'
+          k8s-version: '1.15'
+          promote-stack: 'true'
+          container-tool: 'docker'
       - 'frankfurt':
           branch: 'frankfurt'
           oom_branch: 'master'
           deploy-scenario: 'onap-sdc-nofeature'
           k8s-version: '1.15'
           promote-stack: 'true'
+          container-tool: 'docker'
       - 'elalto':
           branch: 'elalto'
           oom_branch: 'master'
           deploy-scenario: 'onap-sdc-nofeature'
           k8s-version: '1.15'
           promote-stack: 'true'
+          container-tool: 'docker'
 
     environment-type:
       - offline:
@@ -97,6 +108,10 @@
           name: DEPLOY_SCENARIO
           default: '{deploy-scenario}'
           description: 'Scenario to test change with. This depends on the branch of the stack.'
+      - string:
+          name: CONTAINER_TOOL
+          default: '{container-tool}'
+          description: 'Command to use when pulling images. Options docker or podman'
       - string:
           name: CI_LOOP
           default: 'release'