Browse Source

Merge "Clean up unused upgrade test tooling"

Zuul 5 months ago
parent
commit
930ddb77cf
3 changed files with 0 additions and 63 deletions
  1. 0
    17
      run_tests_common.sh
  2. 0
    13
      test-ansible-env-prep.sh
  3. 0
    33
      test-create-previous-venv.sh

+ 0
- 17
run_tests_common.sh View File

@@ -35,29 +35,12 @@ fi
35 35
 
36 36
 ## Vars ----------------------------------------------------------------------
37 37
 
38
-# Set the source branch for upgrade tests
39
-# Be sure to change this whenever a new stable branch
40
-# is created. The checkout must always be N-1.
41
-UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/queens'}
42
-
43 38
 # The bindep file contains the basic distribution packages
44 39
 # required in order to install pip, and ansible via pip.
45 40
 BINDEP_FILE=${BINDEP_FILE:-bindep.txt}
46 41
 
47 42
 ## Main ----------------------------------------------------------------------
48 43
 
49
-# If this test set includes an upgrade test, the
50
-# previous stable release tests repo must also be
51
-# cloned.
52
-# Note:
53
-# Dependent patches to the previous stable release
54
-# tests repo are not supported.
55
-if [[ ! -d "${COMMON_TESTS_PATH}/previous" ]]; then
56
-  git clone -b ${UPGRADE_SOURCE_BRANCH} \
57
-      https://git.openstack.org/openstack/openstack-ansible-tests \
58
-      ${COMMON_TESTS_PATH}/previous
59
-fi
60
-
61 44
 # Perform the initial distribution package install
62 45
 # to allow pip and bindep to work.
63 46
 case "${ID,,}" in

+ 0
- 13
test-ansible-env-prep.sh View File

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

+ 0
- 33
test-create-previous-venv.sh View File

@@ -1,33 +0,0 @@
1
-#!/bin/bash
2
-# Copyright 2018, Rackspace US, Inc.
3
-#
4
-# Licensed under the Apache License, Version 2.0 (the "License");
5
-# you may not use this file except in compliance with the License.
6
-# You may obtain a copy of the License at
7
-#
8
-#     http://www.apache.org/licenses/LICENSE-2.0
9
-#
10
-# Unless required by applicable law or agreed to in writing, software
11
-# distributed under the License is distributed on an "AS IS" BASIS,
12
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
-# See the License for the specific language governing permissions and
14
-# limitations under the License.
15
-
16
-## Shell Opts ----------------------------------------------------------------
17
-
18
-set -e
19
-
20
-## Vars ----------------------------------------------------------------------
21
-
22
-export WORKING_DIR=${WORKING_DIR:-$(pwd)}
23
-export PREVIOUS_VENV=${PREVIOUS_VENV:-"ansible-previous"}
24
-
25
-
26
-pushd ${WORKING_DIR}/.tox
27
-  virtualenv ${PREVIOUS_VENV}
28
-  ${PREVIOUS_VENV}/bin/pip install -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens \
29
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h=stable/queens \
30
-    -r${WORKING_DIR}/tests/common/previous/test-ansible-deps.txt ara
31
-  # Display venv contents
32
-  ${PREVIOUS_VENV}/bin/pip freeze
33
-popd

Loading…
Cancel
Save