summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml73
-rw-r--r--jjb/compass4nfv/compass-deploy.sh10
-rw-r--r--jjb/global/slave-params.yml14
-rw-r--r--utils/push-test-logs.sh2
4 files changed, 55 insertions, 44 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 8927044bc..9f333aae0 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -54,7 +54,7 @@
# master
# -------------------------------
- baremetal-centos:
- slave-label: 'intel-pod8'
+ slave-label: 'intel-pod17'
os-version: 'centos7'
<<: *master
# -------------------------------
@@ -120,6 +120,9 @@
- 'os-nosdn-ovs_dpdk-noha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-bar-ha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
@@ -207,24 +210,21 @@
unstable-threshold: 'FAILURE'
# dovetail only master by now, not sync with A/B/C branches
# here the stream means the SUT stream, dovetail stream is defined in its own job
- # only run on os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha scenario
- # run against SUT master branch, dovetail docker image with latest tag
- # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday)
- # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday)
+ # only run on os-(nosdn|odl_l2|odl_l3)-nofeature-ha scenario
+ # run against SUT master/euphrates branch, dovetail docker image with latest tag(Monday, Tuesday)
+ # run against SUT master/euphrates branch, dovetail docker image with cvp.X.X.X tag(Thursday, Friday)
+ # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag on huawei-pod7
- conditional-step:
condition-kind: and
condition-operands:
- condition-kind: regex-match
- regex: danube
- label: '{stream}'
- - condition-kind: regex-match
- regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+ regex: os-(nosdn|odl_l3)-nofeature-ha
label: '{scenario}'
- condition-kind: day-of-week
day-selector: select-days
days:
MON: true
- SUN: true
+ TUES: true
use-build-time: true
steps:
- trigger-builds:
@@ -243,19 +243,13 @@
condition-kind: and
condition-operands:
- condition-kind: regex-match
- regex: danube
- label: '{stream}'
- - condition-kind: regex-match
- regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+ regex: os-(nosdn|odl_l3)-nofeature-ha
label: '{scenario}'
- condition-kind: day-of-week
day-selector: select-days
days:
- TUES: true
- WED: true
THURS: true
FRI: true
- SAT: true
use-build-time: true
steps:
- trigger-builds:
@@ -273,27 +267,6 @@
condition-kind: and
condition-operands:
- condition-kind: regex-match
- regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
- label: '{scenario}'
- - condition-kind: regex-match
- regex: master
- label: '{stream}'
- steps:
- - trigger-builds:
- - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
- current-parameters: false
- predefined-parameters:
- DEPLOY_SCENARIO={scenario}
- block: true
- same-node: true
- block-thresholds:
- build-step-failure-threshold: 'never'
- failure-threshold: 'never'
- unstable-threshold: 'FAILURE'
- - conditional-step:
- condition-kind: and
- condition-operands:
- - condition-kind: regex-match
regex: os-nosdn-nofeature-ha
label: '{scenario}'
steps:
@@ -453,6 +426,10 @@
name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-nosdn-bar-ha-baremetal-centos-master-trigger'
+ triggers:
+ - timed: '' # '0 19 * * *'
# ----------------------------
# noha-baremetal-centos-master
@@ -533,6 +510,10 @@
name: 'compass-k8-nosdn-nofeature-ha-huawei-pod7-danube-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-nosdn-bar-ha-huawei-pod7-danube-trigger'
+ triggers:
+ - timed: '' # '0 19 * * *'
# ----------------------------
# noha-huawei-pod7-danube
@@ -613,6 +594,10 @@
name: 'compass-os-odl-sfc-ha-baremetal-master-trigger'
triggers:
- timed: '0 10 1-29/2 * *'
+- trigger:
+ name: 'compass-os-nosdn-bar-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '0 2 2-30/2 * *'
# ---------------------
# noha-baremetal-master
@@ -693,6 +678,10 @@
name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
triggers:
- timed: '0 17 2-30/2 * *'
+- trigger:
+ name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger'
+ triggers:
+ - timed: '0 21 1-29/2 * *'
# ---------------------
# noha-baremetal-euphrates
@@ -773,6 +762,10 @@
name: 'compass-os-odl-sfc-ha-virtual-master-trigger'
triggers:
- timed: '0 16 2-30/2 * *'
+- trigger:
+ name: 'compass-os-nosdn-bar-ha-virtual-master-trigger'
+ triggers:
+ - timed: '0 17 1-29/2 * *'
# -------------------
# noha-virtual-master
@@ -853,6 +846,10 @@
name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
triggers:
- timed: '5 1 2-30/2 * *'
+- trigger:
+ name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger'
+ triggers:
+ - timed: '0 19 1-29/2 * *'
# -------------------
# noha-virtual-euphrates
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index ad069a57c..ac649b992 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -45,10 +45,6 @@ else
export NETWORK_CONF_FILE=network.yml
fi
-if [[ "$NODE_NAME" =~ "intel-pod8" ]]; then
- export OS_MGMT_NIC=em4
-fi
-
if [[ "$NODE_NAME" =~ "-virtual" ]]; then
export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE}
export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml
@@ -58,7 +54,11 @@ if [[ "$NODE_NAME" =~ "-virtual" ]]; then
export VIRT_NUMBER=2
fi
else
- export INSTALL_NIC=eth1
+ if [[ "$NODE_NAME" =~ "intel-pod17" ]]; then
+ export INSTALL_NIC=eno2
+ else
+ export INSTALL_NIC=eth1
+ fi
export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE}
export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml
fi
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index c645de60e..dc0fb0c98 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -647,6 +647,20 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- parameter:
+ name: 'intel-pod17-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - intel-pod17
+ default-slaves:
+ - intel-pod17
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+
+- parameter:
name: 'huawei-virtual5-defaults'
parameters:
- label:
diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 238c4c6ad..0fcea0d7b 100644
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -23,7 +23,7 @@ dir_result="${HOME}/opnfv/$project/results/${branch}"
node_list=(\
'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod12' \
'lf-virtual2' 'lf-virtual3' \
-'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' \
+'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' 'intel-pod18' \
'ericsson-pod1' 'ericsson-pod2' \
'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \
'ericsson-virtual4' 'ericsson-virtual5' 'ericsson-virtual12' \