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 "compass: Align scenario short names"
[releng.git]
/
jjb
/
compass4nfv
/
compass-project-jobs.yml
diff --git
a/jjb/compass4nfv/compass-project-jobs.yml
b/jjb/compass4nfv/compass-project-jobs.yml
index
e5039db
..
565aaa3
100644
(file)
--- a/
jjb/compass4nfv/compass-project-jobs.yml
+++ b/
jjb/compass4nfv/compass-project-jobs.yml
@@
-15,25
+15,25
@@
gs-pathname: '/{stream}'
gs-pathname: '/{stream}'
- s
dn-controller
:
- - '
nosdn
':
+ s
cenario
:
+ - '
os-nosdn-nofeature-ha
':
disabled: false
node: huawei-deploy-vm
disabled: false
node: huawei-deploy-vm
- - 'o
dl
':
+ - 'o
s-odl_l2-nofeature-ha
':
disabled: false
node: huawei-deploy-vm
disabled: false
node: huawei-deploy-vm
- - 'o
nos
':
+ - 'o
s-onos-nofeature-ha
':
disabled: false
node: huawei-deploy-vm
disabled: false
node: huawei-deploy-vm
-
- 'opencontrail
':
- disabled: true
- node: huawei-deploy-vm
+
# - 'os-ocl-nofeature-ha
':
+
#
disabled: true
+
#
node: huawei-deploy-vm
jobs:
- 'compass-verify-{stream}'
- 'compass-build-iso-{stream}'
- 'compass-build-ppa-{stream}'
jobs:
- 'compass-verify-{stream}'
- 'compass-build-iso-{stream}'
- 'compass-build-ppa-{stream}'
- - 'compass-deploy-virtual-{s
dn-controller
}-{stream}'
+ - 'compass-deploy-virtual-{s
cenario
}-{stream}'
- 'compass-virtual-daily-{stream}'
########################
- 'compass-virtual-daily-{stream}'
########################
@@
-64,6
+64,9
@@
gs-pathname: '{gs-pathname}'
- '{node}-defaults'
- '{installer}-defaults'
gs-pathname: '{gs-pathname}'
- '{node}-defaults'
- '{installer}-defaults'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-95,9
+98,9
@@
builders:
- shell:
builders:
- shell:
- !include-raw ./compass-build.sh
+ !include-raw
:
./compass-build.sh
- shell:
- shell:
- !include-raw ./compass-deploy-virtual.sh
+ !include-raw
:
./compass-deploy-virtual.sh
publishers:
- archive:
publishers:
- archive:
@@
-134,7
+137,7
@@
branch: '{branch}'
triggers:
branch: '{branch}'
triggers:
- - timed: 'H 1
6
* * *'
+ - timed: 'H 1
4
* * *'
builders:
- trigger-builds:
builders:
- trigger-builds:
@@
-142,15
+145,15
@@
git-revision: true
block: true
- trigger-builds:
git-revision: true
block: true
- trigger-builds:
- - project: 'compass-deploy-virtual-
nosdn
-{stream}'
+ - project: 'compass-deploy-virtual-
os-nosdn-nofeature-ha
-{stream}'
git-revision: true
block: false
- trigger-builds:
git-revision: true
block: false
- trigger-builds:
- - project: 'compass-deploy-virtual-o
dl
-{stream}'
+ - project: 'compass-deploy-virtual-o
s-odl_l2-nofeature-ha
-{stream}'
git-revision: true
block: false
- trigger-builds:
git-revision: true
block: false
- trigger-builds:
- - project: 'compass-deploy-virtual-o
nos
-{stream}'
+ - project: 'compass-deploy-virtual-o
s-onos-nofeature-ha
-{stream}'
git-revision: true
block: false
git-revision: true
block: false
@@
-184,11
+187,11
@@
builders:
- shell:
builders:
- shell:
- !include-raw ./compass-build.sh
+ !include-raw
:
./compass-build.sh
- shell:
- shell:
- !include-raw ./compass-upload-artifact.sh
+ !include-raw
:
./compass-upload-artifact.sh
- shell:
- shell:
- !include-raw ./compass-workspace-cleanup.sh
+ !include-raw
:
./compass-workspace-cleanup.sh
- job-template:
name: 'compass-build-ppa-{stream}'
- job-template:
name: 'compass-build-ppa-{stream}'
@@
-221,10
+224,10
@@
builders:
- shell:
builders:
- shell:
- !include-raw ./compass-makeppa.sh
+ !include-raw
:
./compass-makeppa.sh
- job-template:
- job-template:
- name: 'compass-deploy-virtual-{s
dn-controller
}-{stream}'
+ name: 'compass-deploy-virtual-{s
cenario
}-{stream}'
disabled: false
disabled: false
@@
-244,22
+247,19
@@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - string:
- name: SDN_CONTROLLER
- default: '{sdn-controller}'
- string:
name: DEPLOY_SCENARIO
- string:
name: DEPLOY_SCENARIO
- default: '
none
'
+ default: '
{scenario}
'
- '{node}-defaults'
- '{installer}-defaults'
builders:
- shell:
- '{node}-defaults'
- '{installer}-defaults'
builders:
- shell:
- !include-raw ./compass-workspace-precleanup.sh
+ !include-raw
:
./compass-workspace-precleanup.sh
- shell:
- shell:
- !include-raw ./compass-download-artifact.sh
+ !include-raw
:
./compass-download-artifact.sh
- shell:
- shell:
- !include-raw ./compass-deploy-virtual.sh
+ !include-raw
:
./compass-deploy-virtual.sh
publishers:
- archive:
publishers:
- archive: