diff options
| -rw-r--r-- | jjb/bottlenecks/bottlenecks.yml | 7 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass4nfv.yml | 30 | ||||
| -rw-r--r-- | jjb/ovsnfv/ovsnfv.yml | 16 |
3 files changed, 34 insertions, 19 deletions
diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml index 1d9417c63..2ca87b0b2 100644 --- a/jjb/bottlenecks/bottlenecks.yml +++ b/jjb/bottlenecks/bottlenecks.yml @@ -88,7 +88,8 @@ - project-parameter: project: '{project}' - 'ericsson-ca-build-1-defaults' - - 'bottlenecks-parameter' + - bottlenecks-parameter: + gs-pathname: '{gs-pathname}' scm: - git-scm: @@ -157,7 +158,7 @@ description: "the cache to store packages downloaded from public IP" - string: name: RUBBOS_URL - default: gs://artifacts.opnfv.org/bottlenecks/rubbos + default: gs://artifacts.opnfv.org/bottlenecks/rubbos{gs-pathname} description: "LF artifacts url for storage of bottlenecks packages" - string: name: PACKAGE_URL @@ -221,7 +222,7 @@ - trigger: name: 'bottlenecks-trigger-lf' triggers: - - timed: '0 16 * * *' + - timed: '0 6 * * *' - gerrit: trigger-on: - patchset-created-event: 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 diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index c01d7ae18..f29219c97 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -11,11 +11,11 @@ # 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' +# gs-pathname: '/{stream}' - job-template: name: 'ovsnfv-verify-{stream}' @@ -26,6 +26,10 @@ - gerrit-parameter: branch: '{branch}' - 'intel-us-build-2-defaults' + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." scm: - gerrit-trigger-scm: @@ -71,6 +75,10 @@ - gerrit-parameter: branch: '{branch}' - 'intel-us-build-2-defaults' + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." scm: - gerrit-trigger-scm: @@ -110,8 +118,8 @@ - 'intel-us-build-2-defaults' - string: name: GS_URL - default: gs://$GS_BASE{gs-pathname} - description: "URL to Google Storage." + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." scm: - git-scm: |