summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/bottlenecks/bottlenecks.yml4
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml4
-rw-r--r--jjb/fuel/fuel-project-jobs.yml6
-rw-r--r--jjb/kvmfornfv/kvmfornfv.yml14
-rw-r--r--jjb/opnfv/opnfv-docker.yml7
-rw-r--r--jjb/opnfv/slave-params.yml50
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yml4
7 files changed, 16 insertions, 73 deletions
diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index 26069cf7b..a65330d5d 100644
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -78,8 +78,6 @@
- job-template:
name: 'bottlenecks-{suite}-upload-artifacts-{stream}'
- node: ericsson-build
-
concurrent: true
properties:
@@ -91,7 +89,7 @@
parameters:
- project-parameter:
project: '{project}'
- - 'ericsson-ca-build-1-defaults'
+ - 'ericsson-build-defaults'
- bottlenecks-parameter:
gs-pathname: '{gs-pathname}'
suite: '{suite}'
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index d155b848f..8943afb37 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -129,8 +129,6 @@
- job-template:
name: 'compass-build-iso-{stream}'
- node: ericsson-build
-
concurrent: true
properties:
@@ -145,7 +143,7 @@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - '{node}-defaults'
+ - 'ericsson-build-defaults'
- '{installer}-defaults'
scm:
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index c784d472c..0ba8e3ff1 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -42,7 +42,7 @@
parameters:
- project-parameter:
project: '{project}'
- - 'fuel-build-defaults'
+ - 'ericsson-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
@@ -86,7 +86,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'fuel-build-defaults'
+ - 'ericsson-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
@@ -152,7 +152,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'fuel-build-defaults'
+ - 'ericsson-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 34793adf6..b042c56a7 100644
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -18,17 +18,12 @@
- job-template:
name: 'kvmfornfv-verify-{stream}'
- node: ericsson-build
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'ericsson-build-defaults'
scm:
- gerrit-trigger-scm:
@@ -62,17 +57,12 @@
- job-template:
name: 'kvmfornfv-merge-{stream}'
- node: ericsson-build
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'ericsson-build-defaults'
scm:
- gerrit-trigger-scm:
diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index c16e33eda..04dcf832f 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -27,17 +27,12 @@
- job-template:
name: '{project}-docker-build-push-{stream}'
- node: ericsson-build
-
disabled: false
parameters:
- project-parameter:
project: '{project}'
- - string:
- name: GIT_BASE
- default: "https://gerrit.opnfv.org/gerrit/$PROJECT"
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'ericsson-build-defaults'
- string:
name: PUSH_IMAGE
default: "true"
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index daa4a4f1e..e1f9e448b 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -194,24 +194,6 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'ericsson-build-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - ericsson-build
- default-slaves:
- - ericsson-build
- - string:
- name: INSTALLER_VERSION
- default: stable
- description: 'Version of the installer to deploy'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-- parameter:
name: 'huawei-build-defaults'
parameters:
- node:
@@ -267,15 +249,10 @@
- parameter:
name: 'opnfv-build-defaults'
parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - intel-us-build-1
- - ericsson-ca-build-1
- default-slaves:
- - intel-us-build-1
- - ericsson-ca-build-1
+ - label:
+ name: SLAVE_LABEL
+ default: 'opnfv-build'
+ description: 'Slave label on Jenkins'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -316,21 +293,6 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'ericsson-ca-build-1-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - ericsson-ca-build-1
- default-slaves:
- - ericsson-ca-build-1
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
name: 'zte-build-1-defaults'
parameters:
- node:
@@ -426,11 +388,11 @@
description: 'Git URL to use on these Jenkins Slaves'
- parameter:
- name: 'fuel-build-defaults'
+ name: 'ericsson-build-defaults'
parameters:
- label:
name: SLAVE_LABEL
- default: 'fuel-build'
+ default: 'ericsson-build'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 4f978e189..aa02c8752 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -31,7 +31,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'ericsson-ca-build-1-defaults'
+ - 'ericsson-build-defaults'
scm:
- gerrit-trigger-scm:
@@ -80,7 +80,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'ericsson-ca-build-1-defaults'
+ - 'ericsson-build-defaults'
scm:
- gerrit-trigger-scm: