From 0ddf87704b46bb6d28dbbd7146242cdc5c54133c Mon Sep 17 00:00:00 2001 From: Jacky Hu Date: Tue, 21 Aug 2018 22:21:48 +0800 Subject: [PATCH] Remove obsolete gate hooks As a follow up of I44002e46b5a56031520b7144b476d4514aa1e676, which has removed testenv:py27integration from tox. Change-Id: If7455da076cb9fc5650f710f2d1c97847c63bfaf --- tools/gate/integration/commons | 5 ---- tools/gate/integration/post_test_hook.sh | 19 --------------- tools/gate/integration/pre_test_hook.sh | 30 ------------------------ 3 files changed, 54 deletions(-) delete mode 100644 tools/gate/integration/commons delete mode 100755 tools/gate/integration/post_test_hook.sh delete mode 100755 tools/gate/integration/pre_test_hook.sh diff --git a/tools/gate/integration/commons b/tools/gate/integration/commons deleted file mode 100644 index 8e6afb4..0000000 --- a/tools/gate/integration/commons +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -ex - -export NEUTRON_LBAAS_DASHBOARD_SCREENSHOTS_DIR=/opt/stack/new/neutron-lbaas-dashboard/.tox/py27integration/src/horizon/openstack_dashboard/test/integration_tests/integration_tests_screenshots diff --git a/tools/gate/integration/post_test_hook.sh b/tools/gate/integration/post_test_hook.sh deleted file mode 100755 index b9477bd..0000000 --- a/tools/gate/integration/post_test_hook.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# This script will be executed inside post_test_hook function in devstack gate - -set -x - -DIR=${BASH_SOURCE%/*} -source $DIR/commons $@ - -set +e -cd /opt/stack/new/neutron-lbaas-dashboard -sudo -H -u stack tox -e py27integration -retval=$? -set -e - -if [ -d ${NEUTRON_LBAAS_DASHBOARD_SCREENSHOTS_DIR}/ ]; then - cp -r ${NEUTRON_LBAAS_DASHBOARD_SCREENSHOTS_DIR}/ /home/jenkins/workspace/gate-neutron-lbaas-dashboard-dsvm-integration/ -fi -exit $retval diff --git a/tools/gate/integration/pre_test_hook.sh b/tools/gate/integration/pre_test_hook.sh deleted file mode 100755 index 072847d..0000000 --- a/tools/gate/integration/pre_test_hook.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# This script will be executed inside pre_test_hook function in devstack gate - -set -ex - -DIR=${BASH_SOURCE%/*} -source $DIR/commons $@ - -# Enable LBaaS V2 Neutron plugin -DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" -ENABLED_SERVICES+=",q-lbaasv2" -DISABLED_SERVICES+="q-lbaas" - -# Enable default recommended implementation for LBaaS v2, Octavia -ENABLED_SERVICES+=",octavia,o-cw,o-hk,o-hm,o-api" -DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia" -DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/etc/octavia/octavia.conf]]" -DEVSTACK_LOCAL_CONFIG+=$'\n'"[controller_worker]" -DEVSTACK_LOCAL_CONFIG+=$'\n'"amphora_driver = amphora_noop_driver" -DEVSTACK_LOCAL_CONFIG+=$'\n'"compute_driver = compute_noop_driver" -DEVSTACK_LOCAL_CONFIG+=$'\n'"network_driver = network_noop_driver" - -# Enable LBaaS v2 Horizon plugin -DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas-dashboard https://git.openstack.org/openstack/neutron-lbaas-dashboard" - -export DEVSTACK_LOCAL_CONFIG -export ENABLED_SERVICES -export DISABLED_SERVICES -