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 "add k8s scenario to compass4nfv"
[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
14279e6
..
ee91e02
100644
(file)
--- a/
jjb/compass4nfv/compass-verify-jobs.yml
+++ b/
jjb/compass4nfv/compass-verify-jobs.yml
@@
-13,11
+13,15
@@
gs-pathname: ''
ppa-pathname: '/{stream}'
disabled: false
gs-pathname: ''
ppa-pathname: '/{stream}'
disabled: false
+ openstack-version: 'ocata'
+ branch-type: 'master'
- danube:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
ppa-pathname: '/{stream}'
disabled: false
- danube:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
ppa-pathname: '/{stream}'
disabled: false
+ openstack-version: 'newton'
+ branch-type: 'branch'
distro:
- 'xenial':
distro:
- 'xenial':
@@
-25,7
+29,7
@@
os-version: 'xenial'
openstack-os-version: ''
- 'centos7':
os-version: 'xenial'
openstack-os-version: ''
- 'centos7':
- disabled:
fals
e
+ disabled:
tru
e
os-version: 'centos7'
openstack-os-version: ''
#####################################
os-version: 'centos7'
openstack-os-version: ''
#####################################
@@
-67,14
+71,15
@@
- 'compass-os-.*?-virtual-daily-.*?'
block-level: 'NODE'
- 'compass-os-.*?-virtual-daily-.*?'
block-level: 'NODE'
- scm:
- - git-scm-gerrit
-
wrappers:
- ssh-agent-wrapper
- timeout:
wrappers:
- ssh-agent-wrapper
- timeout:
- timeout:
12
0
+ timeout:
24
0
fail: true
fail: true
+ - fix-workspace-permissions
+
+ scm:
+ - git-scm-gerrit
triggers:
- gerrit:
triggers:
- gerrit:
@@
-108,7
+113,7
@@
- project-parameter:
project: '{project}'
branch: '{branch}'
- project-parameter:
project: '{project}'
branch: '{branch}'
- - 'compass-virtual-defaults'
+ - 'compass-virtual-
{branch-type}-
defaults'
- '{installer}-defaults'
- 'compass-verify-defaults':
installer: '{installer}'
- '{installer}-defaults'
- 'compass-verify-defaults':
installer: '{installer}'
@@
-143,6
+148,7
@@
current-parameters: true
predefined-parameters: |
COMPASS_OS_VERSION={os-version}
current-parameters: true
predefined-parameters: |
COMPASS_OS_VERSION={os-version}
+ COMPASS_OPENSTACK_VERSION={openstack-version}
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
@@
-151,16
+157,18
@@
condition: SUCCESSFUL
projects:
- name: 'functest-compass-virtual-suite-{stream}'
condition: SUCCESSFUL
projects:
- name: 'functest-compass-virtual-suite-{stream}'
- current-parameters:
tru
e
- predefined-parameters:
+ current-parameters:
fals
e
+ predefined-parameters:
|
FUNCTEST_SUITE_NAME=healthcheck
FUNCTEST_SUITE_NAME=healthcheck
+ DEPLOY_SCENARIO=os-nosdn-nofeature-ha
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
- name: 'functest-compass-virtual-suite-{stream}'
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
- name: 'functest-compass-virtual-suite-{stream}'
- current-parameters:
tru
e
- predefined-parameters:
+ current-parameters:
fals
e
+ predefined-parameters:
|
FUNCTEST_SUITE_NAME=vping_ssh
FUNCTEST_SUITE_NAME=vping_ssh
+ DEPLOY_SCENARIO=os-nosdn-nofeature-ha
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
node-parameters: true
kill-phase-on: NEVER
abort-all-job: true
@@
-188,14
+196,15
@@
- 'compass-os-.*?-virtual-daily-.*?'
block-level: 'NODE'
- 'compass-os-.*?-virtual-daily-.*?'
block-level: 'NODE'
- scm:
- - git-scm-gerrit
-
wrappers:
- ssh-agent-wrapper
- timeout:
wrappers:
- ssh-agent-wrapper
- timeout:
- timeout:
12
0
+ timeout:
24
0
fail: true
fail: true
+ - fix-workspace-permissions
+
+ scm:
+ - git-scm-gerrit
triggers:
- gerrit:
triggers:
- gerrit:
@@
-227,7
+236,7
@@
- project-parameter:
project: '{project}'
branch: '{branch}'
- project-parameter:
project: '{project}'
branch: '{branch}'
- - 'compass-virtual-defaults'
+ - 'compass-virtual-
{branch-type}-
defaults'
- '{installer}-defaults'
- 'compass-verify-defaults':
installer: '{installer}'
- '{installer}-defaults'
- 'compass-verify-defaults':
installer: '{installer}'
@@
-287,14
+296,15
@@
- 'functest-compass-virtual.*'
block-level: 'NODE'
- 'functest-compass-virtual.*'
block-level: 'NODE'
- scm:
- - git-scm-gerrit
-
wrappers:
- ssh-agent-wrapper
- timeout:
wrappers:
- ssh-agent-wrapper
- timeout:
- timeout:
12
0
+ timeout:
24
0
fail: true
fail: true
+ - fix-workspace-permissions
+
+ scm:
+ - git-scm-gerrit
builders:
- description-setter:
builders:
- description-setter:
@@
-339,14
+349,10
@@
description: "URL to Google Storage."
- string:
name: PPA_REPO
description: "URL to Google Storage."
- string:
name: PPA_REPO
- default: "http://
205.177.226.237:9999
{ppa-pathname}"
+ default: "http://
artifacts.opnfv.org/compass4nfv/package
{ppa-pathname}"
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
- - choice:
- name: COMPASS_OPENSTACK_VERSION
- choices:
- - 'newton'
- choice:
name: COMPASS_OS_VERSION
choices:
- choice:
name: COMPASS_OS_VERSION
choices: