diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/qtip/qtip-ci-jobs.yml | 10 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 2 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 6 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 16 |
6 files changed, 24 insertions, 14 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index da882cdfe..eb9113114 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -100,7 +100,7 @@ blocking-jobs: - 'compass-os-.*?-{pod}-daily-.*?' - 'compass-os-.*?-baremetal-daily-.*?' - - 'compass-verify-[^-]*' + - 'compass-verify-[^-]*-[^-]*' block-level: 'NODE' wrappers: diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 4d799af8e..5ce906482 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -56,7 +56,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'compass-verify-[^-]*' + - 'compass-verify-[^-]*-[^-]*' - 'compass-os-.*?-virtual-daily-.*?' block-level: 'NODE' diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml index d0d6b47a3..cca8cee4c 100644 --- a/jjb/qtip/qtip-ci-jobs.yml +++ b/jjb/qtip/qtip-ci-jobs.yml @@ -40,6 +40,10 @@ installer: fuel auto-trigger-name: 'qtip-daily-zte-pod2-trigger' <<: *master + - zte-pod3: + installer: fuel + auto-trigger-name: 'qtip-daily-zte-pod3-trigger' + <<: *master #-------------------------------- jobs: @@ -120,5 +124,9 @@ - trigger: name: 'qtip-daily-zte-pod2-trigger' triggers: - - timed: '0 5 * * *' + - timed: '0 7 * * *' +- trigger: + name: 'qtip-daily-zte-pod3-trigger' + triggers: + - timed: '0 1 * * *' diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index d2dc1d1ec..2ebd7757b 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -176,7 +176,7 @@ mkdir -p upload mv docs_output "$local_path" - gsutil -m cp -r "$local_path" "gs://$GS_URL" + gsutil -m cp -r "$local_path" "gs://$gs_path" gsutil -m setmeta \ -h "Content-Type:text/html" \ diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 233cf08bc..3f7f6bf2d 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -14,10 +14,12 @@ branch: '{stream}' gs-pathname: '' disabled: false + slave-label: 'opnfv-build-ubuntu' - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false + slave-label: 'intel-pod3' - job-template: @@ -72,7 +74,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - '{slave-label}-defaults' scm: - gerrit-trigger-scm: @@ -134,7 +136,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - '{slave-label}-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index c10daabe0..9d80e42ae 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -315,7 +315,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: name: 'yardstick-params-armband-baremetal' @@ -329,7 +329,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: name: 'yardstick-params-joid-baremetal' @@ -343,14 +343,14 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: name: 'yardstick-params-intel-pod8' parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: name: 'yardstick-params-lf-pod1' @@ -445,7 +445,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -453,7 +453,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -461,7 +461,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -469,7 +469,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' ####################### |