xci: Remove leftover VMs before proceeding with the deployment

[releng.git] / jjb / xci / xci-daily-jobs.yaml

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index d7e18ef..3627d18 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -21,11 +21,56 @@
           deploy-scenario: 'os-nosdn-nofeature'
           installer-type: 'osa'
           xci-flavor: 'mini'
+      - 'os-nosdn-osm-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'os-nosdn-osm'
+          installer-type: 'osa'
+          xci-flavor: 'mini'
+      - 'os-odl-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'os-odl-nofeature'
+          installer-type: 'osa'
+          xci-flavor: 'mini'
+      - 'os-odl-bgpvpn-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'os-odl-bgpvpn'
+          installer-type: 'osa'
+          xci-flavor: 'mini'
       - 'os-odl-sfc-noha':
           auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-odl-sfc'
           installer-type: 'osa'
           xci-flavor: 'mini'
+      - 'k8-nosdn-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-nosdn-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-canal-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-canal-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-calico-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-calico-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-contiv-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-contiv-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-flannel-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-flannel-nofeature'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
+      - 'k8-nosdn-istio-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          deploy-scenario: 'k8-nosdn-istio'
+          installer-type: 'kubespray'
+          xci-flavor: 'mini'
 
     # -------------------------------
     # XCI PODs
@@ -77,7 +122,9 @@
           use-build-blocker: true
           blocking-jobs:
             - '^xci-verify.*'
+            - '^xci-merge.*'
             - '^xci-os.*'
+            - '^xci-k8.*'
             - '^xci-deploy.*'
             - '^xci-functest.*'
             - '^bifrost-.*periodic.*'
@@ -173,6 +220,7 @@
           use-build-blocker: true
           blocking-jobs:
             - '^xci-verify.*'
+            - '^xci-merge.*'
             - '^xci-deploy.*'
             - '^xci-functest.*'
             - '^bifrost-.*periodic.*'
@@ -233,6 +281,17 @@
 # --------------------------
 # builder macros
 # --------------------------
+# These need to be properly fixed once the basic deployment and functest
+# jobs are working outside of clean vm.
+# One of the ugly fixes is moving functest preparation step into the
+# deployment job itself since functest preparation requires some of the
+# things from deployment job. With clean VM, this wasn't an issue
+# since everything was on clean VM. When we move things out of clean
+# VM, things are done in workspaces of the jobs that are different.
+#
+# Apart from these things, we will need to go through the scripts
+# used for verify jobs and make them updated in order to be able to
+# use them for jobs that don't use clean VM.
 - builder:
     name: 'xci-daily-deploy-macro'
     builders:
@@ -241,15 +300,16 @@
           set -o errexit
           set -o pipefail
 
-          cd $WORKSPACE/xci && ./xci-deploy.sh
+          echo "Cleaning the leftovers from the earlier run"
+          echo "---------------------------------------------------------------------------------"
+          for vm in $(sudo virsh list --all --name | grep -v xci_vm); do
+              echo "Removing $vm"
+              sudo virsh destroy $vm > /dev/null 2>&1 || true
+              sudo virsh undefine $vm > /dev/null 2>&1 || true
+          done
+          echo "---------------------------------------------------------------------------------"
 
-- builder:
-    name: 'xci-daily-functest-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -o errexit
-          set -o pipefail
+          cd $WORKSPACE/xci && ./xci-deploy.sh
 
           echo "Prepare OPNFV VM for Functest"
           echo "---------------------------------------------------------------------------------"
@@ -259,9 +319,18 @@
           while read var; do
               declare -x "\${var}" 2>/dev/null
               echo $var
-          done < ${XCI_PATH}/.cache/xci.env && cd $XCI_PATH/xci && \
+          done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \
           ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-functest.yml
 
           echo "Run Functest"
           echo "---------------------------------------------------------------------------------"
+
+- builder:
+    name: 'xci-daily-functest-macro'
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
           ssh root@192.168.122.2 "/root/run-functest.sh"