From 8012dbea9c8b426634e417ca6a36f10d36df2c19 Mon Sep 17 00:00:00 2001 From: Jacky Hu Date: Mon, 20 Aug 2018 09:10:07 +0800 Subject: [PATCH] Remove obsolete gate hooks As a follow up of I0d8d7213bf1abc690517d14c97f5c312b34b4112, which has removed testenv:py27integration from tox. Change-Id: I45c90370ce92da3cf2d674e24cfbbf65a388fcf1 --- tools/gate/integration/commons | 5 ----- tools/gate/integration/post_test_hook.sh | 19 ------------------ tools/gate/integration/pre_test_hook.sh | 25 ------------------------ 3 files changed, 49 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 01cff646..00000000 --- a/tools/gate/integration/commons +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -ex - -export OCTAVIA_DASHBOARD_SCREENSHOTS_DIR=/opt/stack/new/octavia-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 1c9ed3d7..00000000 --- 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/octavia-dashboard -sudo -H -u stack tox -e py27integration -retval=$? -set -e - -if [ -d ${OCTAVIA_DASHBOARD_SCREENSHOTS_DIR}/ ]; then - cp -r ${OCTAVIA_DASHBOARD_SCREENSHOTS_DIR}/ /home/jenkins/workspace/gate-octavia-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 0f0453fe..00000000 --- a/tools/gate/integration/pre_test_hook.sh +++ /dev/null @@ -1,25 +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 default recommended implementation for 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 octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard" - -export DEVSTACK_LOCAL_CONFIG -export ENABLED_SERVICES -export DISABLED_SERVICES -