summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Vaduva <Paul.Vaduva@enea.com>2016-09-07 09:51:14 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-07 10:42:19 +0000
commitab40963821dfbcc5d6c1ee2190f25b1bd117d711 (patch)
treeee443930284bd95b51d4f34810f109812bb60d35
parent8ed3422e519d114810acc42a3e62e17498717ce6 (diff)
armband: functest jobs refactored to use labels
Change-Id: I50c47a40f3337e7140740f49b09f3e508eb0087c Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
-rw-r--r--jjb/functest/functest-ci-jobs.yml23
-rw-r--r--jjb/opnfv/slave-params.yml18
2 files changed, 20 insertions, 21 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 392545093..0f0cabab3 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -96,6 +96,23 @@
slave-label: '{pod}'
installer: apex
<<: *colorado
+# armband CI PODs
+ - armband-baremetal:
+ slave-label: armband-baremetal
+ installer: fuel
+ <<: *master
+ - armband-virtual:
+ slave-label: armband-virtual
+ installer: fuel
+ <<: *master
+ - armband-baremetal:
+ slave-label: armband-baremetal
+ installer: fuel
+ <<: *colorado
+ - armband-virtual:
+ slave-label: armband-virtual
+ installer: fuel
+ <<: *colorado
#--------------------------------
# None-CI PODs
#--------------------------------
@@ -119,7 +136,7 @@
slave-label: '{pod}'
installer: apex
<<: *master
- - arm-pod1:
+ - arm-pod2:
slave-label: '{pod}'
installer: fuel
<<: *master
@@ -143,7 +160,7 @@
slave-label: '{pod}'
installer: fuel
<<: *colorado
- - arm-pod1:
+ - arm-pod2:
slave-label: '{pod}'
installer: fuel
<<: *colorado
@@ -342,4 +359,4 @@
name: functest-exit
builders:
- shell:
- !include-raw: ./functest-exit.sh \ No newline at end of file
+ !include-raw: ./functest-exit.sh
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 0c8435d6e..c7ec6aa9d 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -604,24 +604,6 @@
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- parameter:
- name: 'arm-pod1-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - arm-pod1
- default-slaves:
- - arm-pod1
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
- - string:
- name: LAB_CONFIG_URL
- default: ssh://git@git.enea.com/pharos/lab-config
- description: 'Base URI to the configuration directory'
-- parameter:
name: 'arm-pod2-defaults'
parameters:
- node: