diff options
| -rw-r--r-- | docs/ci/tables/ci-build-servers.rst | 5 | ||||
| -rw-r--r-- | jjb/global/slave-params.yaml | 18 | ||||
| -rw-r--r-- | jjb/releng/opnfv-utils.yaml | 1 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yaml | 4 |
4 files changed, 0 insertions, 28 deletions
diff --git a/docs/ci/tables/ci-build-servers.rst b/docs/ci/tables/ci-build-servers.rst index b752a7b0f..e8890ecfd 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-build4 <https://build.opnfv.org/ci/computer/ericsson-build4>`_ - - x86_64 - - Ubuntu 16.04 - - `Dianfeng Du`_ * - `lf-build1 <https://build.opnfv.org/ci/computer/lf-build1>`_ - x86_64 - CentOS 7.4 @@ -32,5 +28,4 @@ - `Linux Foundation`_ .. _Linux Foundation: helpdesk@opnfv.org -.. _Dianfeng Du: dianfeng.du@ericsson.com .. _Armband ENEA Team: armband@enea.com diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 9fe7bd7f2..2fd701f6c 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -593,24 +593,6 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'ericsson-build4-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'ericsson-build4' - 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: - node: diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index f8a8d8997..770ba1776 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -88,7 +88,6 @@ - lf-build1 - lf-build2 - lf-build3 - - ericsson-build4 allowed-multiselect: true ignore-offline-nodes: true - project-parameter: diff --git a/jjb/vswitchperf/vswitchperf.yaml b/jjb/vswitchperf/vswitchperf.yaml index b6447fa14..d30a3101f 100644 --- a/jjb/vswitchperf/vswitchperf.yaml +++ b/jjb/vswitchperf/vswitchperf.yaml @@ -102,10 +102,8 @@ description: 'Slave name on Jenkins' allowed-slaves: - intel-pod12 - - ericsson-build4 default-slaves: - intel-pod12 - - ericsson-build4 scm: - git-scm-gerrit @@ -175,10 +173,8 @@ description: 'Slave name on Jenkins' allowed-slaves: - intel-pod12 - - ericsson-build4 default-slaves: - intel-pod12 - - ericsson-build4 scm: - git-scm |