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 "ci: Synchronize Nordix repositories regularly with upstream"
[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 18f106bb84f59218edc92e4e23e2123bac6ee8b8..34bd879aac1e950f52f8a91f0ef6b44b607460d5 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@
-50,17
+50,18
@@
stream:
- 'master':
branch: '{stream}'
stream:
- 'master':
branch: '{stream}'
- disabled: 'false'
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:
- disabled: false
+ slave-label: vpod-deploy-centos7
+ disabled: true
successful: true
failed: true
unstable: true
successful: true
failed: true
unstable: true
@@
-70,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}'
@@
-93,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
@@
-129,6
+132,7
@@
- 'cloud-infra-verify-scenario-.*'
- 'cloud-infra-periodic-engine-.*'
- 'k8-.*'
- 'cloud-infra-verify-scenario-.*'
- 'cloud-infra-periodic-engine-.*'
- 'k8-.*'
+ - 'nolabs-.*'
block-level: 'NODE'
- throttle:
max-per-node: 1
block-level: 'NODE'
- throttle:
max-per-node: 1
@@
-136,9
+140,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:
@@
-178,6
+189,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
@@
-267,8
+281,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: