Merge "Clean up unused upgrade test tooling"

run_tests_common.sh

@@ -35,29 +35,12 @@ fi
 
 ## Vars ----------------------------------------------------------------------
 
-# Set the source branch for upgrade tests
-# Be sure to change this whenever a new stable branch
-# is created. The checkout must always be N-1.
-UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/queens'}
-
 # The bindep file contains the basic distribution packages
 # required in order to install pip, and ansible via pip.
 BINDEP_FILE=${BINDEP_FILE:-bindep.txt}
 
 ## Main ----------------------------------------------------------------------
 
-# If this test set includes an upgrade test, the
-# previous stable release tests repo must also be
-# cloned.
-# Note:
-# Dependent patches to the previous stable release
-# tests repo are not supported.
-if [[ ! -d "${COMMON_TESTS_PATH}/previous" ]]; then
-  git clone -b ${UPGRADE_SOURCE_BRANCH} \
-      https://git.openstack.org/openstack/openstack-ansible-tests \
-      ${COMMON_TESTS_PATH}/previous
-fi
-
 # Perform the initial distribution package install
 # to allow pip and bindep to work.
 case "${ID,,}" in

test-ansible-env-prep.sh

@@ -44,7 +44,6 @@ export ANSIBLE_PLUGIN_DIR="${TESTING_HOME}/.ansible/plugins"
 export ANSIBLE_ROLE_DEP_DIR="${TESTING_HOME}/.ansible/roles"
 export ANSIBLE_ROLE_DIR="${TESTING_HOME}/.ansible/testing-role"
 export COMMON_TESTS_PATH="${WORKING_DIR}/tests/common"
-export OSA_OPS_DIR="${WORKING_DIR}/openstack-ansible-ops"
 
 # Use pip opts to add options to the pip install command.
 # This can be used to tell it which index to use, etc.
@@ -111,18 +110,6 @@ if [[ ! -d "${ANSIBLE_PLUGIN_DIR}" ]]; then
   fi
 fi
 
-if [[ ! -d "${OSA_OPS_DIR}" ]]; then
-  # The ops repo doesn't need a clone, we can just
-  # symlink it.
-  if [[ "${OSA_PROJECT_DIR}" == "openstack-ansible-ops" ]]; then
-    ln -s ${WORKING_DIR} "${OSA_OPS_DIR}"
-  else
-    git clone \
-        https://git.openstack.org/openstack/openstack-ansible-ops \
-        "${OSA_OPS_DIR}"
-  fi
-fi
-
 # Ensure we use the HTTPS/HTTP proxy with pip if it is specified
 if [ -n "$HTTPS_PROXY" ]; then
   PIP_OPTS+=" --proxy $HTTPS_PROXY"

test-create-previous-venv.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-# Copyright 2018, Rackspace US, Inc.
-#
-# 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.
-
-## Shell Opts ----------------------------------------------------------------
-
-set -e
-
-## Vars ----------------------------------------------------------------------
-
-export WORKING_DIR=${WORKING_DIR:-$(pwd)}
-export PREVIOUS_VENV=${PREVIOUS_VENV:-"ansible-previous"}
-
-
-pushd ${WORKING_DIR}/.tox
-  virtualenv ${PREVIOUS_VENV}
-  ${PREVIOUS_VENV}/bin/pip install -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens \
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h=stable/queens \
-    -r${WORKING_DIR}/tests/common/previous/test-ansible-deps.txt ara
-  # Display venv contents
-  ${PREVIOUS_VENV}/bin/pip freeze
-popd