[Compass4nfv] run centos in intel-pod17

Change-Id: Ifbe959d178781c14a9d32db78d84972d2505c8dc
Signed-off-by: wutianwei <wutianwei1@huawei.com>

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 446d071..9d22fe1 100644 (file)
--- 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 ad069a5..ac649b9 100644 (file)
--- 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 c645de6..dc0fb0c 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -646,6 +646,20 @@
           name: GIT_BASE
           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: