summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yaml2
-rw-r--r--jjb/compass4nfv/compass-deploy.sh6
2 files changed, 2 insertions, 6 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index 467210201..cda7399ca 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -54,7 +54,7 @@
# master
# -------------------------------
- baremetal-centos:
- slave-label: 'intel-pod17'
+ slave-label: compass-baremetal-master
os-version: 'centos7'
<<: *master
# -------------------------------
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 4c5448e33..4a66026d6 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -56,11 +56,7 @@ if [[ "$NODE_NAME" =~ "-virtual" ]]; then
export VIRT_NUMBER=2
fi
else
- if [[ "$NODE_NAME" =~ "intel-pod17" ]]; then
- export INSTALL_NIC=eno2
- else
- export INSTALL_NIC=eth1
- fi
+ export INSTALL_NIC=eth1
export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE}
export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml
fi