Merge "Revert "Remove offline slaves""

diff --git a/docs/ci/tables/ci-build-servers.rst b/docs/ci/tables/ci-build-servers.rst
index b752a7b..e8890ec 100644 (file)
--- 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/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 7ac930d..90207fc 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -21,7 +21,7 @@
           from:
           buildargs:
           branch: stable/leguer
-          slave: lf-virtual1-5
+          slave: functest_k8s_leguer
           dependency: 3.12
       - kali:
           from:

diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 9fe7bd7..2fd701f 100644 (file)
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -592,24 +592,6 @@
           default: $WORKSPACE/build_output
           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:

diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index d583304..50e4741 100644 (file)
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -90,7 +90,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 b6447fa..d30a310 100644 (file)
--- 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