summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2020-08-19 22:33:10 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-08-19 22:33:10 +0000
commit7d6033ea6f9301a5dd6a3913a6a2990bd52eda76 (patch)
treeb9b7c3216baec2f3291f3ce5c5c2be09c0fe6068
parent29091f057109344db49a956f663ca16c738f7a3b (diff)
parent163aef8de1322a497635c2616318af87452609f9 (diff)
Merge "Remove ericsson-build3 from Jenkins"
-rw-r--r--docs/ci/tables/ci-build-servers.rst4
-rw-r--r--jjb/global/slave-params.yaml14
-rw-r--r--jjb/releng/opnfv-utils.yaml2
3 files changed, 0 insertions, 20 deletions
diff --git a/docs/ci/tables/ci-build-servers.rst b/docs/ci/tables/ci-build-servers.rst
index ad168653e..b752a7b0f 100644
--- a/docs/ci/tables/ci-build-servers.rst
+++ b/docs/ci/tables/ci-build-servers.rst
@@ -18,10 +18,6 @@
- aarch64
- Ubuntu 16.04
- `Armband ENEA Team`_
- * - `ericsson-build3 <https://build.opnfv.org/ci/computer/ericsson-build3>`_
- - x86_64
- - Ubuntu 16.04
- - `Dianfeng Du`_
* - `ericsson-build4 <https://build.opnfv.org/ci/computer/ericsson-build4>`_
- x86_64
- Ubuntu 16.04
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index b597b30e0..bd8ae345b 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -593,20 +593,6 @@
description: "Directory where the build artifact will be located upon the completion of the build."
- parameter:
- name: 'ericsson-build3-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: 'ericsson-build3'
- 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'
-
-- parameter:
name: 'ericsson-build4-defaults'
parameters:
- label:
diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index 2cdb31bb0..3dd5ce40a 100644
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -27,7 +27,6 @@
- arm-build3
- arm-build4
- arm-build5
- - ericsson-build3
- ericsson-build4
- lf-build2
allowed-multiselect: true
@@ -93,7 +92,6 @@
- lf-build1
- lf-build2
- lf-build3
- - ericsson-build3
- ericsson-build4
allowed-multiselect: true
ignore-offline-nodes: true