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 "GEODE: Make sure the git tag in correct format is present"
[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 84908e6451060a364741e846339aa2c9b8d10f25..12e14a20663f1cd8754ef4e8810e345974b69fb8 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
@@
-139,12
+142,16
@@
- build-timeout:
timeout: 120
- fix-workspace-permissions
- build-timeout:
timeout: 120
- fix-workspace-permissions
+ - openstack:
+ single-use: True
scm:
- git-scm-gerrit:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: $GERRIT_REFSPEC
scm:
- git-scm-gerrit:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: $GERRIT_REFSPEC
+ wipe_workspace: true
+ clean_before: false
triggers:
- gerrit:
triggers:
- gerrit:
@@
-266,7
+273,7
@@
wrappers:
- build-timeout:
wrappers:
- build-timeout:
- timeout:
120
+ timeout:
'{build-timeout}'
- fix-workspace-permissions
scm:
- fix-workspace-permissions
scm:
@@
-274,6
+281,8
@@
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: $GERRIT_REFSPEC
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: $GERRIT_REFSPEC
+ wipe_workspace: true
+ clean_before: false
builders:
- 'cloud-infra-determine-scenario-macro'
builders:
- 'cloud-infra-determine-scenario-macro'