summaryrefslogtreecommitdiffstats
path: root/jjb/opnfv
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-01 15:24:31 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-01 15:27:33 +0100
commite09952c1e3ad16537447d2f732403af4dd6a32ed (patch)
tree2a7d66397af5291ec065093a994658505cf5e376 /jjb/opnfv
parent3457ae5d0205ff0fb3bfd4e0faad2242d4f12b3d (diff)
build: Update slave-params.yml and jobs to use new build servers
Change-Id: I69848dd40abf425acc671b332aec4199d4116ba3 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/opnfv')
-rw-r--r--jjb/opnfv/opnfv-docker.yml7
-rw-r--r--jjb/opnfv/slave-params.yml50
2 files changed, 7 insertions, 50 deletions
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