summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2021-03-31 16:31:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2021-03-31 16:31:45 +0000
commit7320d96b8bad6bbd5da77b64d108964060b92a44 (patch)
tree2d68e8f37b50a43b79d2773ec5728769ffaffc1a /jjb
parent306b5aa1edf6300630a999847072d4d78ec1438f (diff)
parentf81426d7c8e51a9fdb8e7f370f227bab864ba360 (diff)
Merge "Remove References to Ericsson Build4"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/global/slave-params.yaml18
-rw-r--r--jjb/releng/opnfv-utils.yaml1
-rw-r--r--jjb/vswitchperf/vswitchperf.yaml4
3 files changed, 0 insertions, 23 deletions
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