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
engine: Place online and offline jobs correctly
[infra/cicd.git]
/
jjb
/
cloud-infra
/
cloud-infra-verify-scenario.yaml
diff --git
a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index e6bd0eb1eb3c69fee16cd6ad811b61d404bf9674..ab725eefd5d373021102ddb69c81f1c3caef64e0 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/
jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@
-47,31
+47,31
@@
stream:
- 'master':
branch: '{stream}'
stream:
- 'master':
branch: '{stream}'
- disabled: 'false'
distro:
- ubuntu1804:
distro:
- ubuntu1804:
- disabled: false
- successful: false
- failed: false
- unstable: false
- notbuilt: false
+ slave-label: vpod-deploy-ubuntu1804
+ disabled: true
+ successful: true
+ failed: true
+ unstable: true
+ notbuilt: true
- centos7:
- centos7:
- disabled: false
+ slave-label: vpod-deploy-centos7
+ disabled: true
successful: true
failed: true
unstable: true
notbuilt: true
type:
successful: true
failed: true
unstable: true
notbuilt: true
type:
- - virtual:
- slave-label: 'vpod-deploy-city'
+ - virtual
phase:
- deploy:
phase:
- deploy:
- build-timeout:
6
0
+ build-timeout:
12
0
- functest:
- functest:
- build-timeout:
3
0
+ build-timeout:
6
0
jobs:
- 'cloud-infra-verify-scenario-{distro}-{type}-{stream}'
jobs:
- 'cloud-infra-verify-scenario-{distro}-{type}-{stream}'
@@
-111,10
+111,6
@@
name: TEST_SUITE
default: 'healthcheck'
description: 'Test suite to run'
name: TEST_SUITE
default: 'healthcheck'
description: 'Test suite to run'
- - string:
- name: CLEANUP
- default: 'true'
- description: 'Cleanup leftovers of the previous run'
properties:
- logrotate
properties:
- logrotate
@@
-124,7
+120,10
@@
- 'cloud-infra-verify-engine-.*'
- 'cloud-infra-verify-scenario-.*'
- 'cloud-infra-periodic-engine-.*'
- 'cloud-infra-verify-engine-.*'
- 'cloud-infra-verify-scenario-.*'
- 'cloud-infra-periodic-engine-.*'
- - '8-.*'
+ - 'onap-.*'
+ - 'k8-.*'
+ - 'os-.*'
+ - 'nolabs-.*'
block-level: 'NODE'
- throttle:
max-per-node: 1
block-level: 'NODE'
- throttle:
max-per-node: 1
@@
-133,14
+132,18
@@
wrappers:
- build-timeout:
wrappers:
- build-timeout:
- timeout:
9
0
+ timeout:
18
0
- fix-workspace-permissions
- 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:
- nordix-gerrit-trigger-patchset-created:
triggers:
- nordix-gerrit-trigger-patchset-created:
@@
-166,7
+169,6
@@
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
- CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
@@
-186,7
+188,6
@@
DEPLOY_TYPE=$DEPLOY_TYPE
USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
TEST_SUITE=$TEST_SUITE
DEPLOY_TYPE=$DEPLOY_TYPE
USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
TEST_SUITE=$TEST_SUITE
- CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
@@
-199,7
+200,7
@@
- job-template:
name: 'cloud-infra-verify-scenario-{distro}-{phase}-{type}-{stream}'
- job-template:
name: 'cloud-infra-verify-scenario-{distro}-{phase}-{type}-{stream}'
- disabled:
fals
e
+ disabled:
tru
e
concurrent: true
concurrent: true
@@
-238,9
+239,6
@@
name: TEST_REPO_URL
default: 'https://gerrit.nordix.org/infra/test.git'
description: 'URL to Nordix Cloud Infra test repository'
name: TEST_REPO_URL
default: 'https://gerrit.nordix.org/infra/test.git'
description: 'URL to Nordix Cloud Infra test repository'
- - string:
- name: CLEANUP
- default: 'false'
wrappers:
- build-timeout:
wrappers:
- build-timeout:
@@
-252,6
+250,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'