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
Armada: Skip armada scenario deployment on cloud
[infra/cicd.git]
/
jjb
/
cloud-infra
/
cloud-infra-verify-engine.yaml
diff --git
a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 837af99aac90995fe9e145d644f5d069f540ca9c..33447806d972787c0136539dd262664475962e74 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@
-66,20
+66,21
@@
notbuilt: true
cloud:
- city:
notbuilt: true
cloud:
- city:
- slave-label: 'city-jumphost-onap-ubuntu1804'
openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
type:
- virtual:
provisioner-type: 'bifrost'
openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
type:
- virtual:
provisioner-type: 'bifrost'
+ slave-type: 'vpod'
- cloud:
provisioner-type: 'heat'
- cloud:
provisioner-type: 'heat'
+ slave-type: 'jumphost'
phase:
- deploy:
build-timeout: 90
- functest:
phase:
- deploy:
build-timeout: 90
- functest:
- build-timeout:
3
0
+ build-timeout:
6
0
jobs:
- 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}'
jobs:
- 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}'
@@
-101,7
+102,7
@@
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- default: '{
slave-label
}'
+ default: '{
cloud}-{slave-type}-{distro
}'
description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
- string:
name: DISTRO
description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
- string:
name: DISTRO
@@
-167,7
+168,7
@@
variable: OPENRC_FILE
- mask-passwords
- build-timeout:
variable: OPENRC_FILE
- mask-passwords
- build-timeout:
- timeout: 1
2
0
+ timeout: 1
5
0
- fix-workspace-permissions
- openstack:
single-use: True
- fix-workspace-permissions
- openstack:
single-use: True