Clean up role tests

openstack/openstack-ansible-rabbitmq_server

Code Issues Proposed changes

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

This commit is contained in:

Jesse Pretorius

2018年09月09日 11:53:54 +01:00

parent a1b14e7a1b

commit 3789cee86b

7 changed files with 0 additions and 197 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

7
tests/rabbitmq_server-upgrade-overrides.yml

View File

@@ -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*') }}"

39
tests/test-install-previous-rabbitmq.yml

View File

@@ -1,39 +0,0 @@

---

#

# 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

99
tests/test-rabbitmq-upgrades.sh

View File

@@ -1,99 +0,0 @@

#!/usr/bin/env 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.

# 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

20
tests/test-upgrade-post.yml

View File

@@ -1,20 +0,0 @@

---

#

# 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

17
tests/test-upgrade-pre.yml

View File

@@ -1,17 +0,0 @@

---

#

# 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