Remove old tempest remanents from main repo

The senlin/tests/tempest directory was left over after the switch to
senlin-tempest-plugin.  It contained the pre_test_hook and 
post_test_hook scripts.  These scripts already exists in the 
senlin-tempest-plugin repo and should be sourced from there when 
running the tempest jobs.

Change-Id: Iead889fc4e7d95860ed160f595c059dceedf7412
This commit is contained in:
Duc Truong 2018-09-12 00:27:39 +00:00
parent 9ac7037c2b
commit c55f6e5914
9 changed files with 12 additions and 90 deletions

View File

@ -62,13 +62,13 @@
fi
function pre_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./pre_test_hook.sh
}
export -f pre_test_hook
function post_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./post_test_hook.sh
}
export -f post_test_hook

View File

@ -62,13 +62,13 @@
fi
function pre_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./pre_test_hook.sh
}
export -f pre_test_hook
function post_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./post_test_hook.sh
}
export -f post_test_hook

View File

@ -81,13 +81,13 @@
fi
function pre_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./pre_test_hook.sh
}
export -f pre_test_hook
function post_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./post_test_hook.sh
}
export -f post_test_hook

View File

@ -64,13 +64,13 @@
fi
function pre_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./pre_test_hook.sh
}
export -f pre_test_hook
function post_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./post_test_hook.sh
}
export -f post_test_hook

View File

@ -63,13 +63,13 @@
fi
function pre_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./pre_test_hook.sh
}
export -f pre_test_hook
function post_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./post_test_hook.sh
}
export -f post_test_hook

View File

@ -81,13 +81,13 @@
fi
function pre_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./pre_test_hook.sh
}
export -f pre_test_hook
function post_test_hook {
cd /opt/stack/new/senlin/senlin/tests/tempest/
cd /opt/stack/new/senlin-tempest-plugin/senlin_tempest_plugin
source ./post_test_hook.sh
}
export -f post_test_hook

View File

@ -1,5 +0,0 @@
=====
MOVED
=====
The senlin tempest plugin has moved to http://git.openstack.org/cgit/openstack/senlin-tempest-plugin

View File

@ -1,27 +0,0 @@
#!/bin/bash -xe
# 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.
set -ex
export DEST=${DEST:-/opt/stack/new}
export DEVSTACK_DIR=$DEST/devstack
export SENLIN_DIR=$DEST/senlin
. $DEVSTACK_DIR/openrc admin admin
cd $DEST/tempest
echo "Running tempest " $SENLIN_TEST_TYPE "tests"
sudo tox -evenv-tempest -- tempest run --regex $DEVSTACK_GATE_TEMPEST_REGEX

View File

@ -1,46 +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 pre_test_hook function in devstack gate.
set -x
export localconf=$BASE/new/devstack/local.conf
export SENLIN_CONF=/etc/senlin/senlin.conf
export ZAQAR_CONF=/etc/zaqar/zaqar.conf
export SENLIN_BACKEND=${SENLIN_BACKEND:-'openstack_test'}
_LOG_CFG='default_log_levels ='
_LOG_CFG+='amqp=WARN,amqplib=WARN,sqlalchemy=WARN,oslo_messaging=WARN'
_LOG_CFG+=',iso8601=WARN,requests.packages.urllib3.connectionpool=WARN'
_LOG_CFG+=',urllib3.connectionpool=WARN'
_LOG_CFG+=',requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN'
_LOG_CFG+=',keystonemiddleware=WARN'
_LOG_CFG+=',routes.middleware=WARN'
_LOG_CFG+=',stevedore=WARN'
_LOG_CFG+=',oslo_messaging._drivers.amqp=WARN'
_LOG_CFG+=',oslo_messaging._drivers.amqpdriver=WARN'
echo -e '[[post-config|$SENLIN_CONF]]\n[DEFAULT]\n' >> $localconf
echo -e 'num_engine_workers=2\n' >> $localconf
echo -e "cloud_backend=$SENLIN_BACKEND\n" >> $localconf
echo -e $_LOG_CFG >> $localconf
if [[ "$SENLIN_BACKEND" == "openstack" ]]; then
echo -e "[[post-config|$ZAQAR_CONF]]\n[DEFAULT]\n" >> $localconf
echo -e "auth_strategy=keystone\n" >> $localconf
echo -e "[storage]\n" >> $localconf
echo -e "message_pipeline=zaqar.notification.notifier" >> $localconf
fi