summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/armband/armband-ci-jobs.yml72
-rw-r--r--jjb/doctor/doctor.yml2
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml4
-rw-r--r--jjb/functest/functest-daily-jobs.yml8
-rw-r--r--jjb/global/slave-params.yml12
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml12
-rw-r--r--utils/push-test-logs.sh2
7 files changed, 56 insertions, 56 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index cdc14e4e0..f1bff072c 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -52,16 +52,16 @@
slave-label: arm-pod2
installer: fuel
<<: *euphrates
- - arm-pod3:
- slave-label: arm-pod3
+ - arm-pod5:
+ slave-label: arm-pod5
installer: fuel
<<: *euphrates
- arm-pod4:
slave-label: arm-pod4
installer: fuel
<<: *euphrates
- - arm-virtual1:
- slave-label: arm-virtual1
+ - arm-virtual2:
+ slave-label: arm-virtual2
installer: fuel
<<: *euphrates
#--------------------------------
@@ -71,16 +71,16 @@
slave-label: arm-pod2
installer: fuel
<<: *master
- - arm-pod3:
- slave-label: arm-pod3
+ - arm-pod5:
+ slave-label: arm-pod5
installer: fuel
<<: *master
- arm-pod4:
slave-label: arm-pod4
installer: fuel
<<: *master
- - arm-virtual1:
- slave-label: arm-virtual1
+ - arm-virtual2:
+ slave-label: arm-virtual2
installer: fuel
<<: *master
#--------------------------------
@@ -412,31 +412,31 @@
# Enea Armband Non CI Virtual Triggers running against euphrates branch
#--------------------------------------------------------------------
- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-arm-virtual1-euphrates-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-arm-virtual2-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-arm-virtual1-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-arm-virtual2-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-arm-virtual1-euphrates-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-arm-virtual2-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-arm-virtual1-euphrates-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-arm-virtual2-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-nofeature-noha-arm-virtual1-euphrates-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-arm-virtual2-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-arm-virtual1-euphrates-trigger'
+ name: 'fuel-os-odl_l2-sfc-ha-arm-virtual2-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-noha-arm-virtual1-euphrates-trigger'
+ name: 'fuel-os-odl_l2-sfc-noha-arm-virtual2-euphrates-trigger'
triggers:
- timed: ''
@@ -444,31 +444,31 @@
# Enea Armband Non CI Virtual Triggers running against master branch
#--------------------------------------------------------------------
- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-arm-virtual1-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-arm-virtual2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-arm-virtual1-master-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-arm-virtual2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-arm-virtual1-master-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-arm-virtual2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-arm-virtual1-master-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-arm-virtual2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-nofeature-noha-arm-virtual1-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-arm-virtual2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-arm-virtual1-master-trigger'
+ name: 'fuel-os-odl_l2-sfc-ha-arm-virtual2-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-noha-arm-virtual1-master-trigger'
+ name: 'fuel-os-odl_l2-sfc-noha-arm-virtual2-master-trigger'
triggers:
- timed: ''
@@ -538,62 +538,62 @@
# Enea Armband POD 3 Triggers running against master branch
#----------------------------------------------------------
- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-arm-pod5-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-master-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-arm-pod5-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-master-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-arm-pod5-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-master-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod5-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-master-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod5-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-master-trigger'
+ name: 'fuel-os-odl_l2-sfc-ha-arm-pod5-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-master-trigger'
+ name: 'fuel-os-odl_l2-sfc-noha-arm-pod5-master-trigger'
triggers:
- timed: ''
#---------------------------------------------------------------
# Enea Armband POD 3 Triggers running against euphrates branch
#---------------------------------------------------------------
- trigger:
- name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-euphrates-trigger'
+ name: 'fuel-os-odl_l2-nofeature-ha-arm-pod5-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-euphrates-trigger'
+ name: 'fuel-os-nosdn-nofeature-ha-arm-pod5-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-euphrates-trigger'
+ name: 'fuel-os-odl_l3-nofeature-ha-arm-pod5-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-euphrates-trigger'
+ name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod5-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-euphrates-trigger'
+ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod5-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-euphrates-trigger'
+ name: 'fuel-os-odl_l2-sfc-ha-arm-pod5-euphrates-trigger'
triggers:
- timed: ''
- trigger:
- name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-euphrates-trigger'
+ name: 'fuel-os-odl_l2-sfc-noha-arm-pod5-euphrates-trigger'
triggers:
- timed: ''
#--------------------------------------------------------------------------
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 23d12def4..d535d6109 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -39,7 +39,7 @@
pod:
- arm-pod2:
slave-label: '{pod}'
- - arm-pod3:
+ - arm-pod5:
slave-label: '{pod}'
jobs:
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 42e1ad585..92b1db356 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -142,12 +142,12 @@
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- - arm-pod3:
+ - arm-pod5:
slave-label: '{pod}'
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- - arm-virtual1:
+ - arm-virtual2:
slave-label: '{pod}'
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index f14ca758f..802f82c99 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -154,7 +154,7 @@
slave-label: '{pod}'
installer: fuel
<<: *master
- - arm-pod3:
+ - arm-pod5:
slave-label: '{pod}'
installer: fuel
<<: *master
@@ -162,7 +162,7 @@
slave-label: '{pod}'
installer: fuel
<<: *master
- - arm-virtual1:
+ - arm-virtual2:
slave-label: '{pod}'
installer: fuel
<<: *master
@@ -190,7 +190,7 @@
slave-label: '{pod}'
installer: fuel
<<: *danube
- - arm-pod3:
+ - arm-pod5:
slave-label: '{pod}'
installer: fuel
<<: *danube
@@ -198,7 +198,7 @@
slave-label: '{pod}'
installer: fuel
<<: *danube
- - arm-virtual1:
+ - arm-virtual2:
slave-label: '{pod}'
installer: fuel
<<: *danube
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index f5de021a6..9234206a5 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -817,15 +817,15 @@
default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
description: 'Base URI to the configuration directory'
- parameter:
- name: 'arm-pod3-defaults'
+ name: 'arm-pod5-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - arm-pod3
+ - arm-pod5
default-slaves:
- - arm-pod3
+ - arm-pod5
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -853,15 +853,15 @@
default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
description: 'Base URI to the configuration directory'
- parameter:
- name: 'arm-virtual1-defaults'
+ name: 'arm-virtual2-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - arm-virtual1
+ - arm-virtual2
default-slaves:
- - arm-virtual1
+ - arm-virtual2
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 007384b7a..97a246171 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -176,22 +176,22 @@
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
- - arm-pod3:
+ - arm-pod5:
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- - arm-pod3:
+ - arm-pod5:
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *danube
- - arm-virtual1:
+ - arm-virtual2:
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- - arm-virtual1:
+ - arm-virtual2:
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
@@ -381,7 +381,7 @@
default: '-i 104.197.68.199:8086'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-arm-virtual1'
+ name: 'yardstick-params-arm-virtual2'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
@@ -464,7 +464,7 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-arm-pod3'
+ name: 'yardstick-params-arm-pod5'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 79190ec2f..518d20ae5 100644
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -27,7 +27,7 @@ node_list=(\
'ericsson-pod1' 'ericsson-pod2' \
'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \
'ericsson-virtual4' 'ericsson-virtual5' 'ericsson-virtual12' \
-'arm-pod1' 'arm-pod3' \
+'arm-pod1' 'arm-pod5' \
'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' 'huawei-pod5' \
'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \
'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \