From 3789cee86b0a93479f45e85b358df6e67178a0cb Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Sun, 9 Sep 2018 11:53:54 +0100 Subject: [PATCH] Clean up role tests Now that we're using the general templates, we can slim down the role test definitions. We can also remove tests which are not being watched, or which are fundamentally broken. With this we can also remove unused scripts/plays. We do the following: 1. We remove the 'upgrade' job, given that it's been broken all cycle due to the way the job executes and we need to regroup to figure out another way to do it. Change-Id: I473b4162e141e05692e89f0420ea74c745dfc9e5 --- tests/rabbitmq_server-upgrade-overrides.yml | 7 -- tests/test-install-previous-rabbitmq.yml | 39 -------- tests/test-rabbitmq-upgrades.sh | 99 --------------------- tests/test-upgrade-post.yml | 20 ----- tests/test-upgrade-pre.yml | 17 ---- tox.ini | 9 -- zuul.d/project.yaml | 6 -- 7 files changed, 197 deletions(-) delete mode 100644 tests/rabbitmq_server-upgrade-overrides.yml delete mode 100644 tests/test-install-previous-rabbitmq.yml delete mode 100755 tests/test-rabbitmq-upgrades.sh delete mode 100644 tests/test-upgrade-post.yml delete mode 100644 tests/test-upgrade-pre.yml diff --git a/tests/rabbitmq_server-upgrade-overrides.yml b/tests/rabbitmq_server-upgrade-overrides.yml deleted file mode 100644 index 657ad9e6..00000000 --- a/tests/rabbitmq_server-upgrade-overrides.yml +++ /dev/null @@ -1,7 +0,0 @@ -rabbitmq_cookie_token: secrete -rabbitmq_ssl_cert: /etc/rabbitmq/rabbitmq.pem -rabbitmq_ssl_key: /etc/rabbitmq/rabbitmq.key - -rabbitmq_hipe_compile: True - -rabbitmq_erlang_version_spec: "{{ (ansible_pkg_mgr == 'apt') | ternary('1:19.3*','erlang-19*') }}" diff --git a/tests/test-install-previous-rabbitmq.yml b/tests/test-install-previous-rabbitmq.yml deleted file mode 100644 index 803d8468..00000000 --- a/tests/test-install-previous-rabbitmq.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -# Copyright 2018, SUSE LINUX GmbH. -# -# 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. - -# TODO(odyssey4me): -# If/when https://review.openstack.org/543245 is available to -# this script in the previous stable branch, remove this play -# and use it instead. - -# The rabbitmq needs access to hostvars for all containers in order -# to set the values in /etc/hosts. We therefore collect all host/container -# facts before continuing. -- name: Gather facts - hosts: "all" - user: root - gather_facts: true - -# Install previous version -- name: Deploy previous rabbitmq version - hosts: rabbitmq_all - user: root - serial: 1 - any_errors_fatal: true - gather_facts: true - roles: - - role: "previous_rabbitmq_server" - vars_files: - - common/previous/test-vars.yml diff --git a/tests/test-rabbitmq-upgrades.sh b/tests/test-rabbitmq-upgrades.sh deleted file mode 100755 index 460ed2be..00000000 --- a/tests/test-rabbitmq-upgrades.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2016, 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. - -# WARNING: -# This file is use by all OpenStack-Ansible roles for testing purposes. -# Any changes here will affect all OpenStack-Ansible role repositories -# with immediate effect. - -# PURPOSE: -# This script executes test Ansible playbooks required for performing -# an upgrade test of the role. - -## Shell Opts ---------------------------------------------------------------- - -set -e - -## Vars ---------------------------------------------------------------------- - -export WORKING_DIR=${WORKING_DIR:-$(pwd)} -export ROLE_NAME=${ROLE_NAME:-''} - -export ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-""} -export TEST_PLAYBOOK=${TEST_PLAYBOOK:-$WORKING_DIR/tests/test-upgrade-pre.yml} -export TEST_CHECK_MODE=${TEST_CHECK_MODE:-false} -export TEST_IDEMPOTENCE=${TEST_IDEMPOTENCE:-false} -export COMMON_TESTS_PATH="${WORKING_DIR}/tests/common" - -echo "ANSIBLE_OVERRIDES: ${ANSIBLE_OVERRIDES}" -echo "ANSIBLE_PARAMETERS: ${ANSIBLE_PARAMETERS}" -echo "TEST_PLAYBOOK: ${TEST_PLAYBOOK}" -echo "TEST_CHECK_MODE: ${TEST_CHECK_MODE}" -echo "TEST_IDEMPOTENCE: ${TEST_IDEMPOTENCE}" - -## Functions ----------------------------------------------------------------- - -function execute_ansible_playbook { - - export ANSIBLE_CLI_PARAMETERS="${ANSIBLE_PARAMETERS} -e @${ANSIBLE_OVERRIDES}" - export ANSIBLE_BIN=${ANSIBLE_BIN:-"ansible-playbook"} - CMD_TO_EXECUTE="${ANSIBLE_BIN} ${TEST_PLAYBOOK} $@ ${ANSIBLE_CLI_PARAMETERS}" - - echo "Executing: ${CMD_TO_EXECUTE}" - echo "With:" - echo " ANSIBLE_INVENTORY: ${ANSIBLE_INVENTORY}" - echo " ANSIBLE_LOG_PATH: ${ANSIBLE_LOG_PATH}" - - ${CMD_TO_EXECUTE} - -} - -## Main ---------------------------------------------------------------------- - -# Ensure that the Ansible environment is properly prepared -source "${COMMON_TESTS_PATH}/test-ansible-env-prep.sh" - -# Prepare environment for the initial deploy of (previous and current) Galera -# No upgrading or testing is done yet. -export TEST_PLAYBOOK="${WORKING_DIR}/tests/test-upgrade-pre.yml" -export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-install.log" - -# Execute the setup of previous version -execute_ansible_playbook - -# Create an ansible venv matching previous branch -source ${WORKING_DIR}/tests/common/test-create-previous-venv.sh - -# Prepare environment for the deploy of previous Galera: -# No upgrading or testing is done yet. -export TEST_PLAYBOOK="${WORKING_DIR}/tests/test-install-previous-rabbitmq.yml" -export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-previous_rabbitmq-install.log" -export PREVIOUS_VENV="ansible-previous" -export ANSIBLE_BIN="${WORKING_DIR}/.tox/${PREVIOUS_VENV}/bin/ansible-playbook" - -# Execute the setup of previous Keystone -execute_ansible_playbook -# Unset previous branch overrides -unset PREVIOUS_VENV -unset ANSIBLE_BIN - -# Prepare environment for the upgrade -export ANSIBLE_PARAMETERS="${ANSIBLE_PARAMETERS} -e rabbitmq_upgrade=yes" -export TEST_PLAYBOOK="${WORKING_DIR}/tests/test-upgrade-post.yml" -export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-upgrade.log" - -# Execute the upgrade -execute_ansible_playbook diff --git a/tests/test-upgrade-post.yml b/tests/test-upgrade-post.yml deleted file mode 100644 index f8d7f77e..00000000 --- a/tests/test-upgrade-post.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Copyright 2016, 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. - -# Install RabbitMQ server -- import_playbook: common/test-install-rabbitmq.yml - -# Run functional tests -- import_playbook: test-rabbitmq-functional.yml diff --git a/tests/test-upgrade-pre.yml b/tests/test-upgrade-pre.yml deleted file mode 100644 index 35325cdf..00000000 --- a/tests/test-upgrade-pre.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -# Copyright 2015, 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. - -# Setup the host -- import_playbook: common/test-setup-host.yml diff --git a/tox.ini b/tox.ini index 21789ace..08004c89 100644 --- a/tox.ini +++ b/tox.ini @@ -93,15 +93,6 @@ commands = bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" -[testenv:upgrade] -setenv = - {[testenv]setenv} - ANSIBLE_OVERRIDES={toxinidir}/tests/rabbitmq_server-upgrade-overrides.yml - CLONE_UPGRADE_TESTS=yes -commands = - bash -c "{toxinidir}/tests/test-rabbitmq-upgrades.sh" - - [testenv:linters] commands = bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh" diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index a3447f88..e4b83578 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -18,9 +18,3 @@ - check-requirements - publish-openstack-docs-pti - release-notes-jobs-python3 - check: - jobs: - - openstack-ansible-upgrade-ubuntu-xenial - gate: - jobs: - - openstack-ansible-upgrade-ubuntu-xenial