diff options
| -rw-r--r-- | jjb/bottlenecks/bottlenecks.yml | 7 | ||||
| -rw-r--r-- | jjb/ovsnfv/ovsnfv.yml | 16 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 4 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 10 |
4 files changed, 23 insertions, 14 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/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: diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index b94fd8fa2..8d6f55193 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -9,11 +9,11 @@ description: "JJB configured PROJECT parameter to identify an opnfv Gerrit project" - string: name: GS_BASE - default: artifacts.opnfv.org/$PROJECT/ + default: artifacts.opnfv.org/$PROJECT description: "URL to Google Storage." - string: name: GS_BASE_PROXY - default: build.opnfv.org/artifacts/$PROJECT/ + default: build.opnfv.org/artifacts/$PROJECT description: "URL to Google Storage proxy" - parameter: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 470bf68b9..0ef6c9b3f 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -133,7 +133,7 @@ -e "POD_NAME=${NODE_NAME}" \ -e "EXTERNAL_NETWORK=net04_ext" \ opnfv/yardstick \ - run_tests.sh \ + run_tests.sh $YARDSTICK_DB_BACKEND \ $YARDSTICK_SUITE_NAME echo "Yardstick: done!" @@ -177,7 +177,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: 'none' + default: '' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -185,7 +185,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: 'none' + default: '' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -193,7 +193,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: 'db_args' + default: '-r 213.77.62.197' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -201,5 +201,5 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: 'none' + default: '' description: 'Arguments to use in order to choose the backend DB' |