From 3bbebaa4161f9f3c7905feee6cde561153875b25 Mon Sep 17 00:00:00 2001 From: Saad Zaher Date: Mon, 4 Dec 2017 15:48:35 +0000 Subject: [PATCH] Fix gate jobs Change-Id: I3f653f93b1596cc680eff6f8c39c455b96d2d925 --- .zuul.yaml | 24 +++++++++---------- devstack/gate_hook.sh | 4 ++-- .../post.yaml | 0 .../run.yaml | 5 ---- .../post.yaml | 0 .../run.yaml | 5 ---- .../post.yaml | 0 .../run.yaml | 5 ---- 8 files changed, 14 insertions(+), 29 deletions(-) rename playbooks/legacy/{osbackup-freezer-dsvm-centos-7 => freezer-centos-7}/post.yaml (100%) rename playbooks/legacy/{osbackup-freezer-dsvm-centos-7 => freezer-centos-7}/run.yaml (94%) rename playbooks/legacy/{osbackup-freezer-dsvm-opensuse-423 => freezer-opensuse-423}/post.yaml (100%) rename playbooks/legacy/{osbackup-freezer-dsvm-opensuse-423 => freezer-opensuse-423}/run.yaml (94%) rename playbooks/legacy/{osbackup-freezer-dsvm => freezer-ubuntu-xenial}/post.yaml (100%) rename playbooks/legacy/{osbackup-freezer-dsvm => freezer-ubuntu-xenial}/run.yaml (94%) diff --git a/.zuul.yaml b/.zuul.yaml index 5fdf236a..db5e23b2 100644 --- a/.zuul.yaml +++ b/.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 - post-run: playbooks/legacy/osbackup-freezer-dsvm/post.yaml + run: playbooks/legacy/freezer-ubuntu-xenial/run.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 - post-run: playbooks/legacy/osbackup-freezer-dsvm-centos-7/post.yaml + run: playbooks/legacy/freezer-centos-7/run.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 - post-run: playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/post.yaml + run: playbooks/legacy/freezer-opensuse-423/run.yaml + post-run: playbooks/legacy/freezer-opensuse-423/post.yaml timeout: 7800 nodeset: legacy-opensuse-423 required-projects: diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh index 9bfa3fc8..2a5f8f70 100755 --- a/devstack/gate_hook.sh +++ b/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" diff --git a/playbooks/legacy/osbackup-freezer-dsvm-centos-7/post.yaml b/playbooks/legacy/freezer-centos-7/post.yaml similarity index 100% rename from playbooks/legacy/osbackup-freezer-dsvm-centos-7/post.yaml rename to playbooks/legacy/freezer-centos-7/post.yaml diff --git a/playbooks/legacy/osbackup-freezer-dsvm-centos-7/run.yaml b/playbooks/legacy/freezer-centos-7/run.yaml similarity index 94% rename from playbooks/legacy/osbackup-freezer-dsvm-centos-7/run.yaml rename to playbooks/legacy/freezer-centos-7/run.yaml index 4e7ce6d5..fa61d244 100644 --- a/playbooks/legacy/osbackup-freezer-dsvm-centos-7/run.yaml +++ b/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 diff --git a/playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/post.yaml b/playbooks/legacy/freezer-opensuse-423/post.yaml similarity index 100% rename from playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/post.yaml rename to playbooks/legacy/freezer-opensuse-423/post.yaml diff --git a/playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/run.yaml b/playbooks/legacy/freezer-opensuse-423/run.yaml similarity index 94% rename from playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/run.yaml rename to playbooks/legacy/freezer-opensuse-423/run.yaml index 8323dff5..5add8d38 100644 --- a/playbooks/legacy/osbackup-freezer-dsvm-opensuse-423/run.yaml +++ b/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 diff --git a/playbooks/legacy/osbackup-freezer-dsvm/post.yaml b/playbooks/legacy/freezer-ubuntu-xenial/post.yaml similarity index 100% rename from playbooks/legacy/osbackup-freezer-dsvm/post.yaml rename to playbooks/legacy/freezer-ubuntu-xenial/post.yaml diff --git a/playbooks/legacy/osbackup-freezer-dsvm/run.yaml b/playbooks/legacy/freezer-ubuntu-xenial/run.yaml similarity index 94% rename from playbooks/legacy/osbackup-freezer-dsvm/run.yaml rename to playbooks/legacy/freezer-ubuntu-xenial/run.yaml index 6f2dc161..1bdcfbf6 100644 --- a/playbooks/legacy/osbackup-freezer-dsvm/run.yaml +++ b/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