Fix gate jobs

Change-Id: I3f653f93b1596cc680eff6f8c39c455b96d2d925

.zuul.yaml

@@ -2,18 +2,18 @@
     name: openstack/freezer
     check:
       jobs:
-        - osbackup-freezer-dsvm:
+        - freezer-ubuntu-xenial:
             voting: false
-        - osbackup-freezer-dsvm-centos-7:
+        - freezer-centos-7:
             voting: false
-        - osbackup-freezer-dsvm-opensuse-423:
+        - freezer-opensuse-423:
             voting: false
 
 - job:
-    name: osbackup-freezer-dsvm
+    name: freezer-ubuntu-xenial
     parent: legacy-dsvm-base
-    run: playbooks/legacy/osbackup-freezer-dsvm/run.yaml
+    run: playbooks/legacy/freezer-ubuntu-xenial/run.yaml
-    post-run: playbooks/legacy/osbackup-freezer-dsvm/post.yaml
+    post-run: playbooks/legacy/freezer-ubuntu-xenial/post.yaml
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -23,10 +23,10 @@
       - openstack/python-freezerclient
 
 - job:
-    name: osbackup-freezer-dsvm-centos-7
+    name: freezer-centos-7
     parent: legacy-dsvm-base
-    run: playbooks/legacy/osbackup-freezer-dsvm-centos-7/run.yaml
+    run: playbooks/legacy/freezer-centos-7/run.yaml
-    post-run: playbooks/legacy/osbackup-freezer-dsvm-centos-7/post.yaml
+    post-run: playbooks/legacy/freezer-centos-7/post.yaml
     timeout: 7800
     nodeset: legacy-centos-7
     required-projects:
@@ -37,10 +37,10 @@
       - openstack/python-freezerclient
 
 - job:
-    name: osbackup-freezer-dsvm-opensuse-423
+    name: freezer-opensuse-423
     parent: legacy-dsvm-base
-    run: playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/run.yaml
+    run: playbooks/legacy/freezer-opensuse-423/run.yaml
-    post-run: playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/post.yaml
+    post-run: playbooks/legacy/freezer-opensuse-423/post.yaml
     timeout: 7800
     nodeset: legacy-opensuse-423
     required-projects:

devstack/gate_hook.sh

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -ex
+# set -ex
 
 # Link the log file so it will be collected by the CI system
 if [ -n "$BASE" ] && [ -d "$BASE/logs" ]; then
@@ -29,6 +29,6 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service s-proxy s-object s-container
 
 export DEVSTACK_GATE_TEMPEST_REGEX="freezer_tempest_plugin"
 
-$BASE/new/devstack-gate/devstack-vm-gate.sh
+# $BASE/new/devstack-gate/devstack-vm-gate.sh
 
 echo "End Gate Hook"

playbooks/legacy/freezer-centos-7/run.yaml

@@ -61,11 +61,6 @@
 
           export "OVERRIDE_FREEZER_PROJECT_BRANCH"=$ZUUL_BRANCH
 
-          function gate_hook {{
-              source $BASE/new/freezer/devstack/gate_hook.sh
-          }}
-          export -f gate_hook
-
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 

playbooks/legacy/freezer-opensuse-423/run.yaml

@@ -61,11 +61,6 @@
 
           export "OVERRIDE_FREEZER_PROJECT_BRANCH"=$ZUUL_BRANCH
 
-          function gate_hook {{
-              source $BASE/new/freezer/devstack/gate_hook.sh
-          }}
-          export -f gate_hook
-
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 

playbooks/legacy/freezer-ubuntu-xenial/run.yaml

@@ -61,11 +61,6 @@
 
           export "OVERRIDE_FREEZER_PROJECT_BRANCH"=$ZUUL_BRANCH
 
-          function gate_hook {{
-              source $BASE/new/freezer/devstack/gate_hook.sh
-          }}
-          export -f gate_hook
-
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh