jobs: Update dsvm-tempest-xen

diff --git a/jenkins/jobs/jobs.yaml b/jenkins/jobs/jobs.yaml
index b71f62b2c2db0492dc102f3cc7e8e5290f174e1c..97c833a59c3a9b2692eda76e875d1067faeb8648 100644 (file)
--- a/jenkins/jobs/jobs.yaml
+++ b/jenkins/jobs/jobs.yaml
@@ -21,8 +21,11 @@
 
               # Install libvirt here to ensure it is
               # not replaced devstack
-              sudo dpkg -i /opt/nodepool-scripts/*.deb
-              sudo apt-get install -y -f --fix-missing
+              local debs=(/opt/nodepool-scripts/*.deb)
+              if test -e $debs; then
+                sudo dpkg -i /opt/nodepool-scripts/*.deb
+                sudo apt-get install -y -f --fix-missing
+              fi
               # Testing extra conf if possible
               if [[ -e $BASE/new/nova/contrib/xen/vif-bridge-nova-network ]]; then
                 echo "Will use vif-bridge-nova-network from nova.git/contrib/xen/ as vif-bridge"
@@ -60,7 +63,11 @@
           export DEVSTACK_GATE_VIRT_DRIVER=libvirt
           export DEVSTACK_GATE_LIBVIRT_TYPE=xen
           export DEVSTACK_GATE_TIMEOUT=180
-          export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\]|.*test_volume_boot_pattern|.*test_shelve_volume_backed_instance)(^tempest\.(api|scenario|thirdparty))'
+          # devstack_gate_timeout apparently can not be change, instead use BUILD_TIMEOUT:
+          # 180min in ms. instead of the default 120.
+          export BUILD_TIMEOUT=10800000
+          # TestVolumeBootPatternV2.test_volume_boot_pattern failed, there is a timeout while tempest try to connect to the guest via SSH.
+          export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\]|.*TestVolumeBootPattern\.test_(volume_boot_pattern|create_ebs_image_and_check_boot)|.*test_shelve_volume_backed_instance|.*TestVolumeBootPatternV2\.test_volume_boot_pattern)(^tempest\.(api|scenario|thirdparty))'
           export RE_EXEC=true
           echo 'Fix bogus ZUUL_URL'
           export ZUUL_URL=`echo $ZUUL_URL | sed -e s/jenkins-libvirt/104.130.29.226/`