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 "Enable Upstream repos CI for metal3-io integration tests"
[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 e9a1aa417bc84394647bf57f76bfb40d61d48931..b8b549cb8597cb49cec15d40e3cb7a90d0fed5e9 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@
-53,12
+53,14
@@
distro:
- ubuntu1804:
distro:
- ubuntu1804:
+ slave-label: vpod-deploy-ubuntu1804
disabled: false
successful: false
failed: false
unstable: false
notbuilt: false
- centos7:
disabled: false
successful: false
failed: false
unstable: false
notbuilt: false
- centos7:
+ slave-label: vpod-deploy-centos7
disabled: true
successful: true
failed: true
disabled: true
successful: true
failed: true
@@
-69,8
+71,10
@@
- virtual
phase:
- virtual
phase:
- - deploy
- - functest
+ - deploy:
+ build-timeout: 90
+ - functest:
+ build-timeout: 30
jobs:
- 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
jobs:
- 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
@@
-92,7
+96,7
@@
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- default: '
vpod-deploy-city
'
+ default: '
{slave-label}
'
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
@@
-135,9
+139,16
@@
option: project
wrappers:
option: project
wrappers:
+ - credentials-binding:
+ - file:
+ credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+ variable: OPENRC_FILE
+ - mask-passwords
- build-timeout:
timeout: 120
- fix-workspace-permissions
- build-timeout:
timeout: 120
- fix-workspace-permissions
+ - openstack:
+ single-use: True
scm:
- git-scm-gerrit:
scm:
- git-scm-gerrit:
@@
-177,6
+188,9
@@
custom-url: '* $JOB_NAME $BUILD_URL'
builders:
custom-url: '* $JOB_NAME $BUILD_URL'
builders:
+ - shell: |
+ #!/bin/bash
+ cp $OPENRC_FILE /tmp/openrc
- 'cloud-infra-determine-scenario-macro'
- multijob:
name: deploy
- 'cloud-infra-determine-scenario-macro'
- multijob:
name: deploy
@@
-266,8
+280,13
@@
default: 'false'
wrappers:
default: 'false'
wrappers:
+ - credentials-binding:
+ - file:
+ credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+ variable: OPENRC_FILE
+ - mask-passwords
- build-timeout:
- build-timeout:
- timeout:
120
+ timeout:
'{build-timeout}'
- fix-workspace-permissions
scm:
- fix-workspace-permissions
scm: