X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-daily-jobs.yaml;h=649fa852135af87541b9217966290956229eca7c;hb=ac60400477b439a5cf8cdf77e990d2c0c8a75ab4;hp=6f1ce39a0787e1090783f61a26eba37c973ad231;hpb=9f2107eb7569697a77f74cec6894637318e0fac7;p=releng.git

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 6f1ce39a0..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
@@ -119,7 +83,7 @@
             - '^xci-functest.*'
             - '^bifrost-.*periodic.*'
             - '^osa-.*periodic.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
       - logrotate-default
 
     triggers:
@@ -138,6 +102,8 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: XCI_DISTRO
           default: '{distro}'
@@ -237,7 +203,7 @@
             - '^xci-functest.*'
             - '^bifrost-.*periodic.*'
             - '^osa-.*periodic.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
       - throttle:
           enabled: true
           max-per-node: 1
@@ -265,13 +231,15 @@
           default: 'osa'
       - string:
           name: XCI_FLAVOR
-          default: 'mini'
+          default: 'noha'
       - string:
           name: XCI_DISTRO
           default: 'ubuntu'
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: FUNCTEST_VERSION
           default: 'hunter'
@@ -326,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 "---------------------------------------------------------------------------------"
@@ -337,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 "---------------------------------------------------------------------------------"