diff options
| -rw-r--r-- | jjb/armband/armband-project-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/availability/availability.yml | 2 | ||||
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-project-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/conductor/conductor.yml | 2 | ||||
| -rw-r--r-- | jjb/copper/copper.yml | 2 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 2 | ||||
| -rw-r--r-- | jjb/dpacc/dpacc.yml | 2 | ||||
| -rw-r--r-- | jjb/fastpathmetrics/fastpathmetrics.yml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/ipv6/ipv6.yml | 2 | ||||
| -rw-r--r-- | jjb/joid/joid-project-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 2 | ||||
| -rw-r--r-- | jjb/onosfw/onosfw.yml | 6 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 34 | ||||
| -rw-r--r-- | jjb/parser/parser.yml | 2 | ||||
| -rw-r--r-- | jjb/pharos/pharos.yml | 2 | ||||
| -rw-r--r-- | jjb/prediction/prediction.yml | 2 | ||||
| -rw-r--r-- | jjb/promise/promise.yml | 2 | ||||
| -rw-r--r-- | jjb/qtip/qtip-project-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/storperf/storperf.yml | 10 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 4 |
21 files changed, 47 insertions, 47 deletions
diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml index b40949d27..aa089e0d5 100644 --- a/jjb/armband/armband-project-jobs.yml +++ b/jjb/armband/armband-project-jobs.yml @@ -27,7 +27,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml index a320ff732..0d887e760 100644 --- a/jjb/availability/availability.yml +++ b/jjb/availability/availability.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index 7dbaeae6b..a28e2a407 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -40,7 +40,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -79,7 +79,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml index b2c4b1f52..247f4f268 100644 --- a/jjb/conductor/conductor.yml +++ b/jjb/conductor/conductor.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml index 1b16864b8..8aad3f26b 100644 --- a/jjb/copper/copper.yml +++ b/jjb/copper/copper.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index b2cbb0242..cf9f6430b 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -22,7 +22,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml index 0258c23fd..9d788ba0b 100644 --- a/jjb/dpacc/dpacc.yml +++ b/jjb/dpacc/dpacc.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index e8aca182b..e7dbf26f9 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -28,7 +28,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -83,7 +83,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -132,7 +132,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 93a359b8c..7f86281fc 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml index 67bc7885e..5b9691257 100644 --- a/jjb/ipv6/ipv6.yml +++ b/jjb/ipv6/ipv6.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/joid/joid-project-jobs.yml b/jjb/joid/joid-project-jobs.yml index b314da1fa..d5a206bf9 100644 --- a/jjb/joid/joid-project-jobs.yml +++ b/jjb/joid/joid-project-jobs.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index cceda50aa..1cb71cc69 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -25,7 +25,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml index 7dc0241f9..0335b71b2 100644 --- a/jjb/onosfw/onosfw.yml +++ b/jjb/onosfw/onosfw.yml @@ -29,7 +29,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -68,7 +68,7 @@ parameters: - project-parameter: project: '{project}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - git-scm: @@ -91,7 +91,7 @@ parameters: - project-parameter: project: '{project}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 7b0ab23d2..da0808b76 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -402,21 +402,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'opnfv-build-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'opnfv-build' - description: 'Slave label on Jenkins' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." -- parameter: name: 'zte-pod1-defaults' parameters: - node: @@ -646,3 +631,22 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." +- parameter: + name: 'opnfv-build-ubuntu-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'opnfv-build-ubuntu' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 01f51aa68..b8a40cc93 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 3bef22578..98d71286c 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index f8fdceb81..b6471bf9f 100644 --- a/jjb/prediction/prediction.yml +++ b/jjb/prediction/prediction.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml index 7999fb5ce..97a8b3eb3 100644 --- a/jjb/promise/promise.yml +++ b/jjb/promise/promise.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml index c77bac722..75f75116a 100644 --- a/jjb/qtip/qtip-project-jobs.yml +++ b/jjb/qtip/qtip-project-jobs.yml @@ -23,7 +23,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index 3b31badfb..fb70df751 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -19,7 +19,7 @@ - job-template: name: 'storperf-verify-{stream}' - node: opnfv-build + node: opnfv-build-ubuntu parameters: - project-parameter: @@ -82,11 +82,7 @@ - job-template: name: 'storperf-merge-{stream}' - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - - node: opnfv-build + node: opnfv-build-ubuntu parameters: - project-parameter: @@ -148,7 +144,7 @@ # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - node: opnfv-build + node: opnfv-build-ubuntu disabled: true diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index fe6ea49c6..0cf7f9786 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -65,7 +65,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -122,7 +122,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: |