From 36138609f179de50d44fde9be35a92a288aa0531 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Sat, 22 Aug 2020 23:39:48 +0200 Subject: [PATCH] Cleanup the gate scripts after the Zuul v3 migration They are not used anymore, they are tasks are covered by native Zuul functionalities and job definitions. Change-Id: If8b0675194aea60ed2b38620425636bf0d436466 --- devstack/gate/gate_hook.sh | 72 --------------------------------- devstack/gate/post_test_hook.sh | 39 ------------------ 2 files changed, 111 deletions(-) delete mode 100755 devstack/gate/gate_hook.sh delete mode 100755 devstack/gate/post_test_hook.sh diff --git a/devstack/gate/gate_hook.sh b/devstack/gate/gate_hook.sh deleted file mode 100755 index 731291bad..000000000 --- a/devstack/gate/gate_hook.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -# -# 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. - -# This script is executed inside gate_hook function in devstack gate. - -OVERRIDE_ENABLED_SERVICES="mysql,key,tempest,zaqar-websocket,zaqar-wsgi" - -export DEVSTACK_GATE_ZAQAR=1 -export DEVSTACK_GATE_INSTALL_TESTONLY=1 -export DEVSTACK_GATE_NO_SERVICES=1 -export DEVSTACK_GATE_TEMPEST=0 -export DEVSTACK_GATE_TIMEOUT=90 -export KEEP_LOCALRC=1 - -export DEVSTACK_GATE_ZAQAR_TEST_SUITE=$1 -# NOTE(flaper87): Backwards compatibility until `project-config`'s -# patch lands. -export DEVSTACK_GATE_ZAQAR_BACKEND=${2:-$DEVSTACK_GATE_ZAQAR_TEST_SUITE} -if [ "$DEVSTACK_GATE_ZAQAR_BACKEND" == "swift" ]; then - OVERRIDE_ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account -fi -export DEVSTACK_LOCAL_CONFIG+=$" -ZAQAR_BACKEND=$DEVSTACK_GATE_ZAQAR_BACKEND" -export OVERRIDE_ENABLED_SERVICES - -function run_devstack_gate() { - $BASE/new/devstack-gate/devstack-vm-gate.sh -} - -function run_tempest_tests() { - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - run_devstack_gate - - cd $BASE/new/tempest/ - sudo -E testr init - sudo -E tox -evenv-tempest -- tempest run -r zaqar_tempest_plugin -} - -function run_zaqarclient_tests() { - run_devstack_gate - cd $BASE/new/python-zaqarclient - - source $BASE/new/devstack/openrc - cat /etc/mongodb.conf - ZAQARCLIENT_AUTH_FUNCTIONAL=1 nosetests tests.functional -} - -case "$DEVSTACK_GATE_ZAQAR_TEST_SUITE" in - tempest) - run_tempest_tests - ;; - zaqarclient) - run_zaqarclient_tests - ;; - *) - # NOTE(flaper87): Eventually, this will error - run_zaqarclient_tests - ;; -esac - diff --git a/devstack/gate/post_test_hook.sh b/devstack/gate/post_test_hook.sh deleted file mode 100755 index 3dec535f6..000000000 --- a/devstack/gate/post_test_hook.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# 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. - -# This script is executed inside post_test_hook function in devstack gate. - -# source $BASE/new/devstack/openrc admin admin - -function generate_test_results { - if [ -f .testrepository/0 ]; then - sudo .tox/py27-gate/bin/testr last --subunit > $WORKSPACE/testrepository.subunit - sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit - sudo .tox/py27-gate/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html - sudo gzip -9 $BASE/logs/testrepository.subunit - sudo gzip -9 $BASE/logs/testr_results.html - sudo chown $USER:$USER $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz - sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz - fi -} - -set -x - -export ZAQAR_DIR="$BASE/new/zaqar" -sudo chown -R stack:stack $ZAQAR_DIR -cd $ZAQAR_DIR - -# Collect and parse result -generate_test_results -exit $EXIT_CODE