From 939df557398f755b50116e0dad66032d4c2b1bb8 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 7 Sep 2018 14:44:55 +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 'ssl' job, given that the person working on that is no longer doing so, and no-one else has picked up the work. 2. 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: I28ff7b95d3b2cc064c59c9966e9c25c7ad9184da --- tests/ansible-role-requirements.yml | 4 - tests/benchmark-upgrade.yml | 20 ----- tests/test-cinder-resources-results.yml | 30 ------- tests/test-cinder-resources-upgrade.yml | 57 ------------- tests/test-cinder-upgrades.sh | 109 ------------------------ tests/test-install-previous-cinder.yml | 34 -------- tests/test-upgrade.yml | 26 ------ tox.ini | 17 +--- zuul.d/jobs.yaml | 21 ----- zuul.d/project.yaml | 3 - 10 files changed, 1 insertion(+), 320 deletions(-) delete mode 100644 tests/benchmark-upgrade.yml delete mode 100644 tests/test-cinder-resources-results.yml delete mode 100644 tests/test-cinder-resources-upgrade.yml delete mode 100755 tests/test-cinder-upgrades.sh delete mode 100644 tests/test-install-previous-cinder.yml delete mode 100644 tests/test-upgrade.yml delete mode 100644 zuul.d/jobs.yaml diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 06c87c81..2e3c9b79 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -50,10 +50,6 @@ src: https://git.openstack.org/openstack/openstack-ansible-ceph_client scm: git version: master -- name: os_previous_cinder - src: https://git.openstack.org/openstack/openstack-ansible-os_cinder - scm: git - version: stable/queens - name: systemd_service src: https://git.openstack.org/openstack/ansible-role-systemd_service scm: git diff --git a/tests/benchmark-upgrade.yml b/tests/benchmark-upgrade.yml deleted file mode 100644 index 9fe361a1..00000000 --- a/tests/benchmark-upgrade.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Copyright 2017, 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. - -- include: test-cinder-resources-upgrade.yml - -- include: common/test-install-cinder.yml - -- include: test-cinder-resources-results.yml diff --git a/tests/test-cinder-resources-results.yml b/tests/test-cinder-resources-results.yml deleted file mode 100644 index 1c3c97cd..00000000 --- a/tests/test-cinder-resources-results.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# Copyright 2017, 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. - -- name: Playbook to report resource tests - hosts: localhost - user: root - gather_facts: no - tasks: - - name: Kill resource test - command: pkill -f rolling_test - ignore_errors: yes - - name: Register upgrade benchmarking results - async_status: jid={{ rolling_test_benchmark.ansible_job_id }} - register: rolling_test_benchmark_results - until: rolling_test_benchmark_results.finished - - name: Display basic summary - debug: - msg: "Finished upgrade with {{ rolling_test_benchmark_results.stdout }}% API response failure rate" diff --git a/tests/test-cinder-resources-upgrade.yml b/tests/test-cinder-resources-upgrade.yml deleted file mode 100644 index 7a43e6ae..00000000 --- a/tests/test-cinder-resources-upgrade.yml +++ /dev/null @@ -1,57 +0,0 @@ ---- -# Copyright 2017, 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. - -- name: Playbook to run resource tests against an openstack service - hosts: localhost - user: root - become: true - # TODO: remove the static reference to openstack1 - vars: - test_keystone_host: openstack1 - working_dir: "{{ lookup('env', 'WORKING_DIR') }}" - upgrade_venv_folder: "/openstack/venvs/upgrades" - upgrade_test_packages: - - "python-keystoneclient" - - "python-glanceclient" - - "openstacksdk" - tasks: - - name: Install openstack sdk - pip: - name: "{{ upgrade_test_packages }}" - virtualenv: "{{ upgrade_venv_folder }}" - virtualenv_site_packages: "no" - extra_args: >- - {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} - {{ pip_install_options | default('') }} - register: install_packages - until: install_packages is success - retries: 5 - delay: 2 - - - name: Run rolling test script - shell: | - source {{ upgrade_venv_folder }}/bin/activate - ./openstack-ansible-ops/bowling_ball/rolling_tests.py cinder - args: - chdir: "{{ working_dir }}" - executable: /bin/bash - async: 100000 - poll: 0 - environment: - OS_AUTH_URL: "{{ keystone_service_publicurl }}" - OS_PASSWORD: "{{ keystone_auth_admin_password }}" - register: rolling_test_benchmark - vars_files: - - common/test-vars.yml diff --git a/tests/test-cinder-upgrades.sh b/tests/test-cinder-upgrades.sh deleted file mode 100755 index 6ed5f383..00000000 --- a/tests/test-cinder-upgrades.sh +++ /dev/null @@ -1,109 +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 os_neutron role. -# Due to the way Ansible caches and handles modules, we need to run -# separate Ansible runs to ensure the "upgrade" uses the new -# "neutron_migrations_facts" module, instead of the cached version -# used when deploying the previous Neutron version. - -## Shell Opts ---------------------------------------------------------------- - -set -e - -## Vars ---------------------------------------------------------------------- - -export WORKING_DIR=${WORKING_DIR:-$(pwd)} -export ROLE_NAME=${ROLE_NAME:-''} - -export ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-"-vvv"} -export ANSIBLE_OVERRIDES=${ANSIBLE_OVERRIDES:-$WORKING_DIR/tests/os_cinder-overrides.yml} -export TEST_PLAYBOOK=${TEST_PLAYBOOK:-$WORKING_DIR/tests/test-upgrade.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) Cinder -# No upgrading or testing is done yet. -export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-cinder-install.log" - -# Execute the setup of current infrastructure -execute_ansible_playbook - -# Prepare environment for the deploy of previous Nova: -# No upgrading or testing is done yet. -export TEST_PLAYBOOK="${WORKING_DIR}/tests/test-install-previous-cinder.yml" -export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-previous_cinder-install.log" -export PREVIOUS_VENV="ansible-previous" -export ANSIBLE_BIN="${WORKING_DIR}/.tox/${PREVIOUS_VENV}/bin/ansible-playbook" -source ${COMMON_TESTS_PATH}/test-create-previous-venv.sh - -# Execute the setup of previous Cinder -execute_ansible_playbook - -# Unset previous branch overrides -unset PREVIOUS_VENV -unset ANSIBLE_BIN - -# Prepare environment for the upgrade of Cinder -export TEST_PLAYBOOK="${WORKING_DIR}/tests/benchmark-upgrade.yml" -export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-cinder-upgrade.log" - -# Excute the upgrade of Cinder -execute_ansible_playbook - -# Prepare the environment for the testing of upgraded Cinder -export TEST_PLAYBOOK="${COMMON_TESTS_PATH}/test-install-tempest.yml" -export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-cinder-upgrade-test.log" - -# Execute testing of upgraded Cinder -execute_ansible_playbook diff --git a/tests/test-install-previous-cinder.yml b/tests/test-install-previous-cinder.yml deleted file mode 100644 index 7ec30089..00000000 --- a/tests/test-install-previous-cinder.yml +++ /dev/null @@ -1,34 +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. - -# Ensure the repo is setup for previous version -- include: common/previous/test-repo-setup.yml - -- name: Deploy cinder - hosts: cinder_all - user: root - gather_facts: true - pre_tasks: - - include: common/ensure-rabbitmq.yml - vhost_name: "{{ cinder_rabbitmq_vhost }}" - user_name: "{{ cinder_rabbitmq_userid }}" - user_password: "{{ cinder_rabbitmq_password }}" - - include: common/create-grant-db.yml - db_name: "{{ cinder_galera_database }}" - db_password: "{{ cinder_container_mysql_password }}" - roles: - - role: "os_previous_cinder" - vars_files: - - common/previous/test-vars.yml diff --git a/tests/test-upgrade.yml b/tests/test-upgrade.yml deleted file mode 100644 index 6ffac87d..00000000 --- a/tests/test-upgrade.yml +++ /dev/null @@ -1,26 +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 -- include: common/test-setup-host.yml - -# Prepare the cinder-volumes VG -- include: common/test-setup-cinder-localhost.yml - -# Install RabbitMQ/MariaDB -- include: common/test-install-infra.yml - -# Install Keystone -- include: common/test-install-keystone.yml diff --git a/tox.ini b/tox.ini index 55362404..d0726f27 100644 --- a/tox.ini +++ b/tox.ini @@ -93,6 +93,7 @@ commands = commands = bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" + [testenv:distro_install] setenv = {[testenv]setenv} @@ -100,22 +101,6 @@ setenv = commands = bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" -[testenv:upgrade] -setenv = - {[testenv]setenv} - TEST_PLAYBOOK={toxinidir}/tests/test-upgrade.yml - CLONE_UPGRADE_TESTS=yes -commands = - bash -c "{toxinidir}/tests/test-cinder-upgrades.sh" - - -[testenv:ssl] -setenv = - {[testenv]setenv} - ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True -commands = - bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" - [testenv:linters] commands = diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml deleted file mode 100644 index 5095b679..00000000 --- a/zuul.d/jobs.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# Copyright 2017, 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. - -- job: - name: openstack-ansible-cinder-ssl-nv - parent: openstack-ansible-functional-ubuntu-xenial - voting: false - vars: - tox_env: ssl diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 956d251d..76dab085 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -20,14 +20,11 @@ - release-notes-jobs-python3 check: jobs: - - openstack-ansible-upgrade-ubuntu-xenial - - openstack-ansible-cinder-ssl-nv - openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-opensuse-423 - openstack-ansible-functional-distro_install-ubuntu-bionic gate: jobs: - - openstack-ansible-upgrade-ubuntu-xenial - openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-opensuse-423 - openstack-ansible-functional-distro_install-ubuntu-bionic