Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix yaml indention issue of a job paramater
[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 94b174abcaf9a72d44a737da0ce37c807c3f1924..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'
project: 'ONAP-release'
+
stream:
- 'master':
branch: 'master'
oom_branch: 'master'
stream:
- 'master':
branch: 'master'
oom_branch: 'master'
- deploy-scenario: 'onap-
sdc
-nofeature'
+ deploy-scenario: 'onap-
full
-nofeature'
k8s-version: '1.15'
promote-stack: 'false'
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'
- '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'
- 'elalto':
branch: 'elalto'
oom_branch: 'master'
deploy-scenario: 'onap-sdc-nofeature'
k8s-version: '1.15'
promote-stack: 'true'
+ container-tool: 'docker'
environment-type:
- offline:
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.'
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'
- string:
name: CI_LOOP
default: 'release'
@@
-218,7
+233,7
@@
wrappers:
- build-timeout:
wrappers:
- build-timeout:
- timeout:
18
0
+ timeout:
30
0
- credentials-binding:
- username-password-separated:
credential-id: 'nordix-cicd-arm-credentials'
- credentials-binding:
- username-password-separated:
credential-id: 'nordix-cicd-arm-credentials'
@@
-251,7
+266,7
@@
wrappers:
- build-timeout:
wrappers:
- build-timeout:
- timeout: 60
+ timeout: 60
0
- credentials-binding:
- username-password-separated:
credential-id: 'nordix-cicd-arm-credentials'
- credentials-binding:
- username-password-separated:
credential-id: 'nordix-cicd-arm-credentials'