X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-jobs%2Fonap-release-jobs.yaml;h=3325dcc21131999a5bc11037f8f44a31154b5245;hb=994f9d3877609879256064db8f06680e2705a7a9;hp=0a9c381c1a4d540f0875e62083a092287c2684a4;hpb=9df6f17ca7272aefa66a124d21792f4b32297e8d;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
index 0a9c381c..3325dcc2 100644
--- a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
@@ -22,22 +22,29 @@
 
     project: 'ONAP-release'
 
+
     stream:
       - 'master':
           branch: 'master'
-          deploy-scenario: 'onap-sdc-nofeature'
+          oom_branch: 'master'
+          deploy-scenario: 'onap-full-nofeature'
           k8s-version: '1.15'
           promote-stack: 'false'
+          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:
@@ -94,6 +101,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'
@@ -114,6 +125,10 @@
           name: STACK_VERSION
           default: '{branch}'
           description: 'Stack version of engine to package, deploy, test, release'
+      - string:
+          name: NORDIX_OOM_VERSION
+          default: '{oom_branch}'
+          description: 'Stack version of oom to package, deploy, test, release'
       - string:
           name: PROMOTE_STACK
           default: '{promote-stack}'
@@ -211,7 +226,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 180
+          timeout: 300
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
@@ -244,7 +259,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 60
+          timeout: 600
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'