diff --git a/devstack/gate/post_test_hook.sh b/devstack/gate/post_test_hook.sh index 7197cf4a..41dd6314 100755 --- a/devstack/gate/post_test_hook.sh +++ b/devstack/gate/post_test_hook.sh @@ -8,10 +8,6 @@ $BASE/new/designate/devstack/exercise.sh # Import functions needed for the below workaround source $BASE/new/devstack/functions -# Run the new style tempest plugin first, so the workaround below is not -# applied. -sudo BASE=$BASE ./run_tempest_plugin.sh - # Workaround for Tempest architectural changes # See bugs: # 1) https://bugs.launchpad.net/manila/+bug/1531049 diff --git a/devstack/gate/run_tempest_plugin.sh b/devstack/gate/run_tempest_plugin.sh deleted file mode 100755 index 7a5dba19..00000000 --- a/devstack/gate/run_tempest_plugin.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -e -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -# TODO(kiall): One old style tests are no longer used, we should switch from -# this pattern for executing the tests to a true tempest gate job. - -# How many seconds to wait for the API to be responding before giving up -API_RESPONDING_TIMEOUT=20 - -if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:9001/ 2>/dev/null | grep -q 'v1' ; do sleep 1; done"; then - echo "The Designate API failed to respond within ${API_RESPONDING_TIMEOUT} seconds" - exit 1 -fi - -echo "Successfully contacted the Designate API" - -# Where Tempest code lives -TEMPEST_DIR=${TEMPEST_DIR:-"$BASE/new/tempest"} - -pushd $TEMPEST_DIR -tox -e all-plugin -- designate -popd