summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2016-01-05 01:10:19 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-05 01:10:20 +0000
commit95561b6d8fad21199ce009ead9998defda7a6b32 (patch)
treeb581760fbecfd2bfa48be6212edf771b4d8ee5a3
parent1861ae7e652d2d8317c8809aecc7822c097c4de2 (diff)
parent727a81bd7cd63df8c2ae44e2ce50e71fb3165624 (diff)
Merge "[compass] fix the GS_URL for B release branch"
-rw-r--r--jjb/compass4nfv/compass4nfv.yml30
1 files changed, 18 insertions, 12 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index f1bcee757..547971074 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -9,17 +9,17 @@
- 'compass-daily-{stream}'
- 'compass-build-iso-{stream}'
- 'compass-build-ppa-{stream}'
- - 'compass-deploy-virtual-{flavor}'
- - 'compass-deploy-bare-huawei-us'
+ - 'compass-deploy-virtual-{flavor}-{stream}'
+ - 'compass-deploy-bare-huawei-us-{stream}'
# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
- branch: 'master'
+ branch: '{stream}'
gs-pathname: ''
# - brahmaputra:
-# branch: 'stable/brahmaputra'
-# gs-pathname: '/brahmaputra'
+# branch: 'stable/{stream}'
+# gs-pathname: '/{stream}'
flavor:
- cluster-odl:
@@ -59,6 +59,7 @@
branch: '{branch}'
- compass-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
- string:
name: FLAVOR_CONF
default: 'virtual_cluster'
@@ -118,6 +119,7 @@
project: '{project}'
- compass-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
scm:
- git-scm:
@@ -134,19 +136,19 @@
git-revision: true
block: true
- trigger-builds:
- - project: 'compass-deploy-virtual-cluster'
+ - project: 'compass-deploy-virtual-cluster-{stream}'
git-revision: true
block: true
- trigger-builds:
- - project: 'compass-deploy-virtual-cluster-odl'
+ - project: 'compass-deploy-virtual-cluster-odl-{stream}'
git-revision: true
block: true
- trigger-builds:
- - project: 'compass-deploy-virtual-cluster-onos'
+ - project: 'compass-deploy-virtual-cluster-onos-{stream}'
git-revision: true
block: true
- trigger-builds:
- - project: 'compass-deploy-bare-huawei-us'
+ - project: 'compass-deploy-bare-huawei-us-{stream}'
git-revision: true
block: true
@@ -169,6 +171,7 @@
project: '{project}'
- compass-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
scm:
- git-scm:
@@ -201,6 +204,7 @@
project: '{project}'
- compass-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
scm:
- git-scm:
@@ -215,7 +219,7 @@
- 'builder-compass-make-ppa'
- job-template:
- name: 'compass-deploy-virtual-{flavor}'
+ name: 'compass-deploy-virtual-{flavor}-{stream}'
disabled: false
@@ -234,6 +238,7 @@
project: '{project}'
- compass-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
- string:
name: FLAVOR_CONF
default: '{conf}'
@@ -250,7 +255,7 @@
fingerprint: true
- job-template:
- name: 'compass-deploy-bare-huawei-us'
+ name: 'compass-deploy-bare-huawei-us-{stream}'
disabled: false
@@ -269,6 +274,7 @@
project: '{project}'
- compass-parameter:
installer: '{installer}'
+ gs-pathname: '{gs-pathname}'
builders:
- 'builder-compass-ci-preclean-workspace'
@@ -305,7 +311,7 @@
description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
- string:
name: GS_URL
- default: artifacts.opnfv.org/$PROJECT/
+ default: artifacts.opnfv.org/$PROJECT{gs-pathname}
description: "URL to Google Storage."
- string:
name: GS_URL_PROXY