X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-daily-jobs.yaml;h=649fa852135af87541b9217966290956229eca7c;hb=33a7b28d446fbd2d8fca6213f3c9c805a7aafd2d;hp=18b20f2ac12aace3c9aa4f3553fef9ed1e4147a2;hpb=cdb60a4b93c166f8610caac60d128449faeacd35;p=releng.git

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 18b20f2ac..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 "---------------------------------------------------------------------------------"
@@ -341,9 +313,7 @@
               declare -x "\${var}" 2>/dev/null
               echo $var
           done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \
-          ansible-playbook -i playbooks/dynamic_inventory.py \
-          -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \
-          playbooks/prepare-tests.yml
+          ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml
           ssh root@192.168.122.2 "/root/prepare-tests.sh"
           echo "---------------------------------------------------------------------------------"