Merge "Native DevStack jobs"

2 files changed, 0 insertions, 106 deletions

diff --git a/openstackclient/tests/functional/post_test_hook.sh b/openstackclient/tests/functional/post_test_hook.sh
deleted file mode 100755
index d990cb99..00000000
--- a/openstackclient/tests/functional/post_test_hook.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# This is a script that kicks off a series of functional tests against an
-# OpenStack cloud. It will attempt to create an instance if one is not
-# available. Do not run this script unless you know what you're doing.
-# For more information refer to:
-# https://docs.openstack.org/python-openstackclient/latest/
-
-function generate_testr_results {
-    if [ -f .testrepository/0 ]; then
-        sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit
-        sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
-        sudo .tox/functional/bin/subunit2html $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
-    elif [ -f .stestr/0 ]; then
-        sudo .tox/functional/bin/stestr last --subunit > $WORKSPACE/testrepository.subunit
-        sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
-        sudo .tox/functional/bin/subunit2html $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
-}
-
-export OPENSTACKCLIENT_DIR="$BASE/new/python-openstackclient"
-sudo chown -R $USER:stack $OPENSTACKCLIENT_DIR
-
-# Go to the openstackclient dir
-cd $OPENSTACKCLIENT_DIR
-
-# Run tests
-echo "Running openstackclient functional test suite"
-set +e
-
-# Source environment variables to kick things off
-source ~stack/devstack/openrc admin admin
-echo 'Running tests with:'
-env | grep OS
-
-# Preserve env for OS_ credentials
-sudo -E -H -u $USER tox -efunctional
-EXIT_CODE=$?
-set -e
-
-# Collect and parse result
-generate_testr_results
-exit $EXIT_CODE
diff --git a/openstackclient/tests/functional/post_test_hook_tips.sh b/openstackclient/tests/functional/post_test_hook_tips.sh
deleted file mode 100755
index 4cae7cdf..00000000
--- a/openstackclient/tests/functional/post_test_hook_tips.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# This is a script that kicks off a series of functional tests against an
-# OpenStack cloud. It will attempt to create an instance if one is not
-# available. Do not run this script unless you know what you're doing.
-# For more information refer to:
-# https://docs.openstack.org/python-openstackclient/latest/
-
-# This particular script differs from the normal post_test_hook because
-# it installs the master (tip) version of osc-lib, os-client-config
-# and openstacksdk, OSCs most important dependencies.
-
-function generate_testr_results {
-    if [ -f .testrepository/0 ]; then
-        sudo .tox/functional-tips/bin/testr last --subunit > $WORKSPACE/testrepository.subunit
-        sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
-        sudo .tox/functional-tips/bin/subunit2html $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
-    elif [ -f .stestr/0 ]; then
-        sudo .tox/functional-tips/bin/stestr last --subunit > $WORKSPACE/testrepository.subunit
-        sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
-        sudo .tox/functional-tips/bin/subunit2html $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
-}
-
-export OPENSTACKCLIENT_DIR="$BASE/new/python-openstackclient"
-sudo chown -R $USER:stack $OPENSTACKCLIENT_DIR
-
-# Go to the openstackclient dir
-cd $OPENSTACKCLIENT_DIR
-
-# Run tests
-echo "Running openstackclient functional-tips test suite"
-set +e
-
-# Source environment variables to kick things off
-source ~stack/devstack/openrc admin admin
-echo 'Running tests with:'
-env | grep OS
-
-# Preserve env for OS_ credentials
-sudo -E -H -u $USER tox -e functional-tips
-EXIT_CODE=$?
-set -e
-
-# Collect and parse result
-generate_testr_results
-exit $EXIT_CODE