diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-07-25 20:54:05 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-07-25 21:35:35 +0200 |
| commit | 3aad5c124e77b44b513727281e471d7083eb190b (patch) | |
| tree | 9d878a787d80381f4d278a6335633ded351d4b08 | |
| parent | 09c905482f1c4578a94c420057bc391718d508c2 (diff) | |
Select lf-virtual1 as defaut slave (ut)
It allows verifying unit tests vs python3 and building docs (see
latest OpenStack upper-constraints)
Change-Id: Ie9566d4b1e0a288d5944c3111ec2dc0749be1975
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | jjb/functest/functest-kubernetes-project-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/xtesting-project-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml | 18 |
4 files changed, 21 insertions, 3 deletions
diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml index 178df6a9e..9ceabb19c 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -28,7 +28,7 @@ phase: - 'unit-tests-and-docs': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'lf-virtual1' - job-template: name: 'functest-kubernetes-verify-{stream}' diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index 69df265dc..269ecee7a 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -28,7 +28,7 @@ phase: - 'unit-tests-and-docs': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'lf-virtual1' - job-template: name: 'functest-verify-{stream}' diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml index 39e73b719..6e6f4453b 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -28,7 +28,7 @@ phase: - 'unit-tests-and-docs': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'lf-virtual1' - job-template: name: 'xtesting-verify-{stream}' diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index a415546be..1a8ce417f 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -611,6 +611,24 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: + name: 'lf-virtual1-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'lf-virtual1' + description: 'Slave label on Jenkins' + all-nodes: false + node-eligibility: 'ignore-offline' + - 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: 'pharos-dashboard-defaults' parameters: - label: |