summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2017-02-08 12:44:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-08 12:44:51 +0000
commiteabda5925636340865f5af11b12a6ac0887c5b46 (patch)
treeb34bba10f3909f7a636903334abb4da12ea36974
parent6bc1913f86975b388841a914188e80161841f3ce (diff)
parent4ffec7c1e27c4b2a83e6cbde6da517f8741a8143 (diff)
Merge "Update new slave tag"
-rw-r--r--jjb/armband/armband-project-jobs.yml2
-rw-r--r--jjb/armband/armband-verify-jobs.yml10
-rw-r--r--jjb/global/slave-params.yml4
3 files changed, 8 insertions, 8 deletions
diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml
index 0fb5e4e63..fd37c5af6 100644
--- a/jjb/armband/armband-project-jobs.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -41,7 +41,7 @@
- project-parameter:
project: '{project}'
branch: '{branch}'
- - 'opnfv-build-arm-defaults'
+ - 'opnfv-build-enea-defaults'
- '{installer}-defaults'
- armband-project-parameter:
gs-pathname: '{gs-pathname}'
diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index 05146a35c..3486718e4 100644
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -21,13 +21,13 @@
#####################################
phase:
- 'basic':
- slave-label: 'opnfv-build-arm'
+ slave-label: 'opnfv-build-enea'
- 'build':
- slave-label: 'opnfv-build-arm'
+ slave-label: 'opnfv-build-enea'
- 'deploy-virtual':
- slave-label: 'opnfv-build-arm'
+ slave-label: 'opnfv-build-enea'
- 'smoke-test':
- slave-label: 'opnfv-build-arm'
+ slave-label: 'opnfv-build-enea'
#####################################
# jobs
#####################################
@@ -95,7 +95,7 @@
- project-parameter:
project: '{project}'
branch: '{branch}'
- - 'opnfv-build-arm-defaults'
+ - 'opnfv-build-enea-defaults'
- 'armband-verify-defaults':
gs-pathname: '{gs-pathname}'
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 8fc0207da..79accebef 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -278,11 +278,11 @@
# Parameters for build slaves
#####################################################
- parameter:
- name: 'opnfv-build-arm-defaults'
+ name: 'opnfv-build-enea-defaults'
parameters:
- label:
name: SLAVE_LABEL
- default: 'opnfv-build-arm'
+ default: 'opnfv-build-enea'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT