summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2017-12-13 03:23:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-13 03:23:42 +0000
commit6675b4103a2399d5120494308aab5b8ef82091d2 (patch)
tree37c81c7cca12be2ae364fe26a50996c8f0900d5a /jjb
parentf924c2d6265466f01a3a30c7ea810f728514b000 (diff)
parentcb400fc26e2008777388c771bb8aaa45efb709ac (diff)
Merge "[Compass4nfv] run centos in intel-pod17"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml2
-rw-r--r--jjb/compass4nfv/compass-deploy.sh10
-rw-r--r--jjb/global/slave-params.yml14
3 files changed, 20 insertions, 6 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index a0d553c18..4e58234c3 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
# -------------------------------
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: