summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-17 09:34:24 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-17 09:40:05 +0100
commitc140775f5a3e28dbe778d1b8b116f3a80445222d (patch)
treed1f85e550dfd2d0829b90b54cd1fb3fbfb0181fa
parentf2eff823d3a54ebf8358da140c379e5a66de3ffc (diff)
Rename Intel build slaves and update jobs using these slaves
Change-Id: Id152b3a4e1fa58bbb52a0a5644bca72a16db31b7 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/opnfv/slave-params.yml33
-rw-r--r--jjb/ovsnfv/ovsnfv.yml6
2 files changed, 27 insertions, 12 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 5e0274d84..5c1c58ff2 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -263,30 +263,45 @@
description: "Directory where the build artifact will be located upon the completion of the build."
- parameter:
- name: 'intel-us-build-1-defaults'
+ name: 'intel-build1-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - intel-us-build-1
+ - intel-build1
default-slaves:
- - intel-us-build-1
+ - intel-build1
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'intel-us-build-2-defaults'
+ name: 'intel-build2-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - intel-us-build-2
+ - intel-build2
default-slaves:
- - intel-us-build-2
+ - intel-build2
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
+ name: 'intel-build3-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - intel-build3
+ default-slaves:
+ - intel-build3
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -399,15 +414,15 @@
description: 'Git URL to use on these Jenkins Slaves'
- parameter:
- name: 'intel-us-deploy-virtual-2-defaults'
+ name: 'intel-virtual2-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - intel-us-deploy-virtual-2
+ - intel-virtual2
default-slaves:
- - intel-us-deploy-virtual-2
+ - intel-virtual2
- string:
name: INSTALLER_VERSION
default: latest
diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index d0c180c5b..8a119d9fb 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -24,7 +24,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'intel-us-build-2-defaults'
+ - 'intel-build2-defaults'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
@@ -73,7 +73,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'intel-us-build-2-defaults'
+ - 'intel-build2-defaults'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
@@ -114,7 +114,7 @@
parameters:
- project-parameter:
project: '{project}'
- - 'intel-us-build-2-defaults'
+ - 'intel-build2-defaults'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'