From: Robert Tomczyk <robert.tomczyk@est.tech>
Date: Wed, 25 Nov 2020 12:06:22 +0000 (+0000)
Subject: Merge "ONAP: Set correct Java alternatives for ONAP project"
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=994f9d3877609879256064db8f06680e2705a7a9;hp=da550f9aebbab8f1345121901bb139e743988ea6;p=infra%2Fcicd.git

Merge "ONAP: Set correct Java alternatives for ONAP project"
---

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
index f5101717..e20c4d18 100644
--- a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
@@ -26,7 +26,7 @@
       - 'master':
           branch: '{stream}'
           k8s-version: '1.15'
-          deploy-scenario: 'onap-sdc-nofeature'
+          deploy-scenario: 'onap-full-nofeature'
       - 'frankfurt':
           branch: '{stream}'
           k8s-version: '1.15'
diff --git a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
index 3909f642..3325dcc2 100644
--- a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
@@ -22,25 +22,29 @@
 
     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'
       - '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 +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'
diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
index 512fccb7..4d44a0aa 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
@@ -26,7 +26,7 @@
       - 'master':
           branch: '{stream}'
           k8s-version: '1.15'
-          deploy-scenario: 'onap-sdc-nofeature'
+          deploy-scenario: 'onap-full-nofeature'
       - 'frankfurt':
           branch: '{stream}'
           k8s-version: '1.15'
diff --git a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
index 77c925d0..94e5673c 100644
--- a/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
@@ -22,37 +22,41 @@
 
     project: 'onap-verify-package'
 
+
     stream:
       - 'master':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
+          container-tool: 'docker'
           gated-projects: 'infra/stack/onap|infra/installer/oom'
           successful: false
           failed: false
           unstable: false
           notbuilt: false
-          deploy-scenario: 'onap-sdc-full'
+          deploy-scenario: 'onap-full-nofeature'
       - 'frankfurt':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
+          container-tool: 'docker'
           gated-projects: 'infra/stack/onap|infra/installer/oom'
           successful: false
           failed: false
           unstable: false
           notbuilt: false
-          deploy-scenario: 'onap-sdc-full'
+          deploy-scenario: 'onap-full-nofeature'
       - 'elalto':
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
+          container-tool: 'docker'
           gated-projects: 'infra/stack/onap|infra/installer/oom'
           successful: false
           failed: false
           unstable: false
           notbuilt: false
-          deploy-scenario: 'onap-sdc-full'
+          deploy-scenario: 'onap-full-nofeature'
 
     distro:
       - ubuntu1804
@@ -79,6 +83,10 @@
           name: EXECUTION_MODE
           default: '{execution-mode}'
           description: 'Engine execution mode - packaging'
+      - string:
+          name: CONTAINER_TOOL
+          default: '{container-tool}'
+          description: 'Command to use when pulling images. Options docker or podman'
       - string:
           name: DISTRO
           default: '{distro}'