Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "implement get/query scenario(s) and add unittest"
[releng.git]
/
jjb
/
compass4nfv
/
compass-verify-jobs.yml
diff --git
a/jjb/compass4nfv/compass-verify-jobs.yml
b/jjb/compass4nfv/compass-verify-jobs.yml
index
87c19a9
..
6ef5fbb
100644
(file)
--- a/
jjb/compass4nfv/compass-verify-jobs.yml
+++ b/
jjb/compass4nfv/compass-verify-jobs.yml
@@
-12,19
+12,15
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- -
colorado
:
+ -
danube
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled:
tru
e
+ disabled:
fals
e
distro:
distro:
- - 'trusty':
- disabled: false
- os-version: 'trusty'
- openstack-os-version: ''
- - 'centos7':
+ - 'xenial':
disabled: false
disabled: false
- os-version: '
centos7
'
+ os-version: '
xenial
'
openstack-os-version: ''
#####################################
# patch verification phases
openstack-os-version: ''
#####################################
# patch verification phases
@@
-64,21
+60,17
@@
block-level: 'NODE'
scm:
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 120
fail: true
triggers:
- gerrit:
- timeout:
timeout: 120
fail: true
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
@@
-124,7
+116,7
@@
name: basic
condition: SUCCESSFUL
projects:
name: basic
condition: SUCCESSFUL
projects:
- - name: '
compass-verify-basic
-{stream}'
+ - name: '
opnfv-lint-verify
-{stream}'
current-parameters: true
node-parameters: true
kill-phase-on: FAILURE
current-parameters: true
node-parameters: true
kill-phase-on: FAILURE
@@
-137,7
+129,6
@@
current-parameters: true
predefined-parameters: |
COMPASS_OS_VERSION={os-version}
current-parameters: true
predefined-parameters: |
COMPASS_OS_VERSION={os-version}
- COMPASS_OS_VERSION_OPTION={openstack-os-version}
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
@@
-152,6
+143,13
@@
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
+ - name: 'functest-compass-virtual-suite-{stream}'
+ current-parameters: true
+ predefined-parameters:
+ FUNCTEST_SUITE_NAME=vping_ssh
+ node-parameters: true
+ kill-phase-on: NEVER
+ abort-all-job: true
- job-template:
name: 'compass-verify-{phase}-{distro}-{stream}'
- job-template:
name: 'compass-verify-{phase}-{distro}-{stream}'
@@
-174,15
+172,10
@@
block-level: 'NODE'
scm:
block-level: 'NODE'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
wrappers:
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - ssh-agent-wrapper
- timeout:
timeout: 120
fail: true
- timeout:
timeout: 120
fail: true
@@
-242,11
+235,8
@@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'mitaka'
- 'newton'
- 'newton'
- - 'liberty'
- choice:
name: COMPASS_OS_VERSION
choices:
- choice:
name: COMPASS_OS_VERSION
choices:
- - 'trusty'
- - 'centos7'
+ - 'xenial'