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
Merge "ONAP: Set correct Java alternatives for ONAP project"
[infra/cicd.git]
/
jjb
/
cloud-infra
/
onap-jobs
/
onap-release-deploy-test.yaml
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 08a3eef1920bfdb40e4e91e7b384e380143efc66..e20c4d1873785e4ef302678238e9edc6ece777e2 100644
(file)
--- 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'
- 'master':
branch: '{stream}'
k8s-version: '1.15'
- deploy-scenario: 'onap-
sdc
-nofeature'
+ deploy-scenario: 'onap-
full
-nofeature'
- 'frankfurt':
branch: '{stream}'
k8s-version: '1.15'
- 'frankfurt':
branch: '{stream}'
k8s-version: '1.15'
@@
-112,11
+112,11
@@
description: 'IDF file to use for deployment'
- string:
name: HEAT_STACK_NAME
description: 'IDF file to use for deployment'
- string:
name: HEAT_STACK_NAME
- default: "nordix-cicd-verify-onap-{environment-type}-{distro}-
$GERRIT_CHANGE_NUMBER
"
+ default: "nordix-cicd-verify-onap-{environment-type}-{distro}-
{stream}
"
description: 'Name of the created stack'
- string:
name: KEYPAIR_NAME
description: 'Name of the created stack'
- string:
name: KEYPAIR_NAME
- default: "keypair-nordix-cicd-verify-onap-{environment-type}-{distro}-
$GERRIT_CHANGE_NUMBER
"
+ default: "keypair-nordix-cicd-verify-onap-{environment-type}-{distro}-
{stream}
"
description: 'Name of the created keypair'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
description: 'Name of the created keypair'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
@@
-176,7
+176,7
@@
wipe-workspace: true
wrappers:
- build-timeout:
wipe-workspace: true
wrappers:
- build-timeout:
- timeout:
3
00
+ timeout:
6
00
- credentials-binding:
- file:
credential-id: '{openrc-credentials-file}'
- credentials-binding:
- file:
credential-id: '{openrc-credentials-file}'
@@
-210,7
+210,6
@@
fi
builders:
fi
builders:
- - 'generate-release-metadata-macro'
- 'generate-k8sdeployment-environment-macro'
- multijob:
name: "{environment-type} deployment on {type} instances"
- 'generate-k8sdeployment-environment-macro'
- multijob:
name: "{environment-type} deployment on {type} instances"
@@
-230,7
+229,6
@@
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
- property-file: $WORKSPACE/change.properties
publishers:
- postbuildscript:
builders:
publishers:
- postbuildscript:
builders:
@@
-261,7
+259,7
@@
wrappers:
- build-timeout:
wrappers:
- build-timeout:
- timeout:
3
00
+ timeout:
6
00
- credentials-binding:
- file:
credential-id: '{openrc-credentials-file}'
- credentials-binding:
- file:
credential-id: '{openrc-credentials-file}'
@@
-294,7
+292,7
@@
option: project
wrappers:
- build-timeout:
option: project
wrappers:
- build-timeout:
- timeout:
3
00
+ timeout:
6
00
- credentials-binding:
- file:
credential-id: '{openrc-credentials-file}'
- credentials-binding:
- file:
credential-id: '{openrc-credentials-file}'