From 17b077c25aa9003eaf2f2326df50447bf9d0e56d Mon Sep 17 00:00:00 2001
From: Bharat Kumar Kobagana <bharat.kobagana@redhat.com>
Date: Tue, 14 Apr 2015 15:31:33 +0530
Subject: [PATCH] Skip test_volume_boot_pattern for GlusterFS until bug 1444806
 is fixed

From the past couple of weeks the job
"check-tempest-dsvm-full-glusterfs-nv" is failing because of two
reasons:
1. Empty provider location of 'volume from snapshot'
2. Nova/Libvirt doesn't support delete snapshot when vm is off

Look at Bug 1441050 for more details. Patch [1] closes this
Bug 1441050.

The cinder glusterfs CI job started failing recently when
test_volume_boot_pattern was enabled in tempest, before which
the CI job was running successfully.

Hence, I am proposing this patch to skip test_volume_boot_pattern
for GlusterFS CI job, until Nova/Libvirt issue is fixed.

This patch creates a new job template
"check-tempest-dsvm-full-glusterfs{branch-designator}" for glusterfs
specific jobs.

[1] https://review.openstack.org/171482

Related-Bug: #1444806
Change-Id: I3487db550ba0966e60779b955b6796a03d2690a5
---
 jenkins/jobs/devstack-gate.yaml | 36 ++++++++++++++++++++++++++++++++-
 jenkins/jobs/projects.yaml      | 10 ++++-----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 1246a48507..8930206464 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -1941,6 +1941,41 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-full-glusterfs{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=1
+          export PROJECTS="stackforge/devstack-plugin-glusterfs $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-glusterfs git://git.openstack.org/stackforge/devstack-plugin-glusterfs"
+
+          # Skip test_volume_boot_pattern test cases for GlusterFS until bug 1444806 is fixed.
+          # Below regex also exclude the slow tag.
+          # '557cd2c2-4eb8-4dce-98be-f86765ff311' is the idempotent id of 'test_volume_boot_pattern' test case.
+          r="^(?!(.*\[.*slow.*\])|(.*\[.*557cd2c2-4eb8-4dce-98be-f86765ff311.*\])).*$"
+          export DEVSTACK_GATE_TEMPEST_REGEX="$r"
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-trove{branch-designator}'
     node: '{node}'
@@ -2044,6 +2079,5 @@
       - '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
       - '{pipeline}-tempest-dsvm-nova-v21-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-nova-v21-neutron-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-glusterfs{branch-designator}'
       - '{pipeline}-tempest-dsvm-trove{branch-designator}'
       - '{pipeline}-grenade-dsvm-trove{branch-designator}'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 6a0c5d7a03..5a2063da1e 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3619,15 +3619,13 @@
 
     jobs:
       - gate-{name}-bashate
-      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-glusterfs{branch-designator}':
+          node: devstack-precise || devstack-trusty
           pipeline: check
-          plugin: glusterfs
-          plugin-repo: stackforge/devstack-plugin-glusterfs
           branch-designator: '-nv'
-      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+      - '{pipeline}-tempest-dsvm-full-glusterfs{branch-designator}':
+          node: devstack-precise || devstack-trusty
           pipeline: check
-          plugin: glusterfs
-          plugin-repo: stackforge/devstack-plugin-glusterfs
           branch-designator: ''
 
 - project: