From 350b5c93f6e3bdd1451218a99a4fc9763033be56 Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Wed, 18 Aug 2021 14:13:41 -0700 Subject: [PATCH] Replaces lf-build1/2 references with lf-build5/6 Updating parameters to use labels where applicable. Also disables the 'ansible-build-server' job until it can be verified to work on the new build servers without causing issues. Change-Id: I130d18c54a66c2cd504ed950a61c7249c3beefa8 Signed-off-by: Trevor Bramwell --- docs/ci/tables/ci-build-servers.rst | 8 ++++---- jjb/barometer/barometer.yaml | 4 ++-- jjb/cirv/cirv.yaml | 2 +- jjb/global/slave-params.yaml | 18 ------------------ jjb/opnfvdocs/docs-rtd.yaml | 4 ++-- jjb/releng/opnfv-lint.yaml | 12 ++++++------ jjb/releng/opnfv-utils.yaml | 12 +++++------- jjb/releng/releng-info-vote.yaml | 2 +- jjb/releng/releng-release-jobs.yaml | 6 +++--- 9 files changed, 24 insertions(+), 44 deletions(-) diff --git a/docs/ci/tables/ci-build-servers.rst b/docs/ci/tables/ci-build-servers.rst index e8890ecfd..b2f4893e3 100644 --- a/docs/ci/tables/ci-build-servers.rst +++ b/docs/ci/tables/ci-build-servers.rst @@ -18,13 +18,13 @@ - aarch64 - Ubuntu 16.04 - `Armband ENEA Team`_ - * - `lf-build1 `_ + * - `lf-build5 `_ - x86_64 - - CentOS 7.4 + - Ubuntu 18.04 - `Linux Foundation`_ - * - `lf-build2 `_ + * - `lf-build6 `_ - x86_64 - - Ubuntu 16.10 + - CentOS 8 - `Linux Foundation`_ .. _Linux Foundation: helpdesk@opnfv.org diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml index b27781345..2d8e0d36d 100644 --- a/jjb/barometer/barometer.yaml +++ b/jjb/barometer/barometer.yaml @@ -41,7 +41,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'lf-build2-defaults' + - 'opnfv-build-centos-defaults' scm: - git-scm-gerrit @@ -98,7 +98,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'lf-build2-defaults' + - 'opnfv-build-centos-defaults' scm: - git-scm diff --git a/jjb/cirv/cirv.yaml b/jjb/cirv/cirv.yaml index e628f43bd..ef9b71b27 100644 --- a/jjb/cirv/cirv.yaml +++ b/jjb/cirv/cirv.yaml @@ -4,7 +4,7 @@ tag: - latest: branch: master - slave: lf-build2 + slave: lf-build5 - builder: name: cirv-run-tox diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 2fd701f6c..d23171832 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -574,24 +574,6 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." -- parameter: - name: 'lf-build2-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'lf-build2' - 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: 'huawei-build-defaults' parameters: diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index e680747ef..42dcf31a5 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -27,7 +27,7 @@ parameters: - label: name: SLAVE_LABEL - default: 'lf-build2' + default: 'lf-build5' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' @@ -52,7 +52,7 @@ parameters: - label: name: SLAVE_LABEL - default: 'lf-build2' + default: 'lf-build5' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' diff --git a/jjb/releng/opnfv-lint.yaml b/jjb/releng/opnfv-lint.yaml index dcd262aa5..c20a1ec1f 100644 --- a/jjb/releng/opnfv-lint.yaml +++ b/jjb/releng/opnfv-lint.yaml @@ -46,8 +46,8 @@ name: SLAVE_NAME description: Slaves to execute yamllint default-slaves: - - lf-build1 - - lf-build2 + - lf-build5 + - lf-build6 allowed-multiselect: true ignore-offline-nodes: true @@ -99,8 +99,8 @@ name: SLAVE_NAME description: Slaves to execute pylint default-slaves: - - lf-build1 - - lf-build2 + - lf-build5 + - lf-build6 allowed-multiselect: true ignore-offline-nodes: true @@ -150,8 +150,8 @@ name: SLAVE_NAME description: Slaves to execute yamllint default-slaves: - - lf-build1 - - lf-build2 + - lf-build5 + - lf-build6 allowed-multiselect: true ignore-offline-nodes: true diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index 50e4741a6..21725ea98 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -24,7 +24,6 @@ name: SLAVE_NAME description: Slaves to prune docker images default-slaves: - - lf-build2 - lf-build5 - lf-build6 allowed-multiselect: true @@ -56,7 +55,7 @@ name: SLAVE_NAME description: 'script lives on master node' default-slaves: - - lf-build2 + - lf-build5 allowed-multiselect: false ignore-offline-nodes: true - project-parameter: @@ -79,7 +78,7 @@ project-type: freestyle - disabled: false + disabled: true concurrent: true parameters: @@ -87,9 +86,8 @@ name: SLAVE_NAME description: Build Servers default-slaves: - - lf-build1 - - lf-build2 - - lf-build3 + - lf-build5 + - lf-build6 allowed-multiselect: true ignore-offline-nodes: true - project-parameter: @@ -150,7 +148,7 @@ name: SLAVE_NAME description: Build Servers default-slaves: - - lf-build2 + - lf-build5 - project-parameter: project: releng branch: master diff --git a/jjb/releng/releng-info-vote.yaml b/jjb/releng/releng-info-vote.yaml index 83818585a..102a77afc 100644 --- a/jjb/releng/releng-info-vote.yaml +++ b/jjb/releng/releng-info-vote.yaml @@ -1,6 +1,6 @@ --- - project: name: info-vote - build-node: lf-build2 + build-node: lf-build5 jobs: - 'info-vote-verify' diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml index 35fda14ec..39671a869 100644 --- a/jjb/releng/releng-release-jobs.yaml +++ b/jjb/releng/releng-release-jobs.yaml @@ -83,10 +83,10 @@ parameters: - node: name: SLAVE_NAME - description: 'Only run merge job on build1 or 2' + description: 'Only run merge job on build5 or 6' default-slaves: - - lf-build1 - - lf-build2 + - lf-build5 + - lf-build6 allowed-multiselect: false ignore-offline-nodes: true - stream-parameter: -- 2.16.6