From: Fatih Degirmenci <fdegir@gmail.com>
Date: Wed, 28 Nov 2018 09:08:45 +0000 (+0000)
Subject: Merge "xci: Enable daily baremetal jobs"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=622cd7d594a4b4fcdff913ead7a29ce1409db9f1;hp=2caa2e6d5b210efb88e28aeb21d7a945da4fb1f0

Merge "xci: Enable daily baremetal jobs"
---

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 66cbb834f..649fa8521 100644
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -19,53 +19,17 @@
       - 'os-nosdn-nofeature-noha':
           deploy-scenario: 'os-nosdn-nofeature'
           installer-type: 'osa'
-          xci-flavor: 'mini'
-      - 'os-nosdn-osm-noha':
-          deploy-scenario: 'os-nosdn-osm'
-          installer-type: 'osa'
-          xci-flavor: 'mini'
-      - 'os-odl-nofeature-noha':
-          deploy-scenario: 'os-odl-nofeature'
-          installer-type: 'osa'
-          xci-flavor: 'mini'
-      - 'os-odl-bgpvpn-noha':
-          deploy-scenario: 'os-odl-bgpvpn'
-          installer-type: 'osa'
-          xci-flavor: 'mini'
-      - 'os-odl-sfc-noha':
-          deploy-scenario: 'os-odl-sfc'
-          installer-type: 'osa'
-          xci-flavor: 'mini'
-      - 'k8-nosdn-nofeature-noha':
-          deploy-scenario: 'k8-nosdn-nofeature'
-          installer-type: 'kubespray'
-          xci-flavor: 'mini'
-      - 'k8-canal-nofeature-noha':
-          deploy-scenario: 'k8-canal-nofeature'
-          installer-type: 'kubespray'
-          xci-flavor: 'mini'
+          xci-flavor: 'noha'
       - 'k8-calico-nofeature-noha':
           deploy-scenario: 'k8-calico-nofeature'
           installer-type: 'kubespray'
-          xci-flavor: 'mini'
-      - 'k8-contiv-nofeature-noha':
-          deploy-scenario: 'k8-contiv-nofeature'
-          installer-type: 'kubespray'
-          xci-flavor: 'mini'
-      - 'k8-flannel-nofeature-noha':
-          deploy-scenario: 'k8-flannel-nofeature'
-          installer-type: 'kubespray'
-          xci-flavor: 'mini'
-      - 'k8-nosdn-istio-noha':
-          deploy-scenario: 'k8-nosdn-istio'
-          installer-type: 'kubespray'
-          xci-flavor: 'mini'
+          xci-flavor: 'noha'
 
     # -------------------------------
     # XCI PODs
     # -------------------------------
     pod:
-      - virtual:
+      - baremetal:
           <<: *master
 
     # -------------------------------
@@ -74,13 +38,13 @@
     distro:
       - 'ubuntu':
           disabled: false
-          slave-label: xci-virtual
+          slave-label: xci-baremetal
       - 'centos':
           disabled: true
-          slave-label: xci-virtual
+          slave-label: xci-baremetal
       - 'opensuse':
           disabled: false
-          slave-label: xci-virtual
+          slave-label: xci-baremetal
 
     # -------------------------------
     #        Phases
@@ -267,7 +231,7 @@
           default: 'osa'
       - string:
           name: XCI_FLAVOR
-          default: 'mini'
+          default: 'noha'
       - string:
           name: XCI_DISTRO
           default: 'ubuntu'
@@ -330,7 +294,15 @@
           done
           echo "---------------------------------------------------------------------------------"
 
-          cd $WORKSPACE/xci && ./xci-deploy.sh
+          # select the right pdf/idf
+          pdf=$WORKSPACE/xci/var/${NODE_NAME}-pdf.yml
+          idf=$WORKSPACE/xci/var/${NODE_NAME}-idf.yml
+          if [[ "$NODE_NAME" =~ "virtual" ]]; then
+              pdf=$WORKSPACE/xci/var/pdf.yml
+              idf=$WORKSPACE/xci/var/idf.yml
+          fi
+
+          cd $WORKSPACE/xci && ./xci-deploy.sh -p $pdf -i $idf
 
           echo "Prepare OPNFV VM for Tests"
           echo "---------------------------------------------------------------------------------"