Fix intel-pod[17,18] assignment (Airship)

It sets Compass baremetal-centos to compass-baremetal-master
arbitrarily. It should have been cleant prior to new assigment
and seems safe (CompassNFV doesn't participate to the last releases)

Change-Id: I08c6a9e0b5996d7f94f7eb0cdc427471878eaf90
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docs/ci/tables/ci-baremetal-servers.rst b/docs/ci/tables/ci-baremetal-servers.rst
index db0a1a9..cccf750 100644 (file)
--- a/docs/ci/tables/ci-baremetal-servers.rst
+++ b/docs/ci/tables/ci-baremetal-servers.rst
@@ -97,15 +97,15 @@
      - PDF
      - IDF
    * - `intel-pod17 <https://build.opnfv.org/ci/computer/intel-pod17>`_
-     - Compass4NFV
+     - Airship
      -
      - PDF
      - IDF
    * - `intel-pod18 <https://build.opnfv.org/ci/computer/intel-pod18>`_
-     - JOID
-     - Ubuntu 16.04
-     - `PDF <https://git.opnfv.org/pharos/plain/labs/intel/pod18.yaml>`__
-     - `IDF <https://git.opnfv.org/pharos/plain/labs/intel/idf-pod18.yaml>`__
+     - Airship
+     -
+     - PDF
+     - IDF
    * - `lf-pod1 <https://build.opnfv.org/ci/computer/lf-pod1>`_
      - Apex
      - CentOS 7

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index 4672102..cda7399 100644 (file)
--- 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 4c5448e..4a66026 100644 (file)
--- 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