RabbitMQ Upgrade Testing

This commit does the following three things:

1. Updates test-install-rabbitmq-server.yml to use the correct
   rabbitmq host group
2. Copies test-upgrade.yml to test.yml, which should test both
   installation and upgrade of RabbitMQ
3. Updates test.yml to only perform upgrade testing when the package
   manager is != 'yum', this is due to [1]
4. Deletes test-upgrade.yml

[1] https://github.com/ansible/ansible-modules-core/pull/4547

Change-Id: I8f6c1b8d0de4666ab5f892162caa66f5c5c966d9

tests/test-install-rabbitmq-server.yml

@@ -21,7 +21,7 @@
 # The cluster must be stopped when doing major/minor upgrades
 # http://www.rabbitmq.com/clustering.html#upgrading
 - name: Stop RabbitMQ nodes that are not the upgrader
-  hosts: rabbitmq_all[1:]
+  hosts: "{{ rabbitmq_host_group }}[1:]"
   serial: 1
   max_fail_percentage: 0
   user: root
@@ -31,6 +31,8 @@
         name: "rabbitmq-server"
         state: "stopped"
       when: rabbitmq_upgrade | default(false) | bool
+  vars_files:
+    - test-vars.yml
 
 - name: Install RabbitMQ server
   hosts: "{{ rabbitmq_host_group }}"

tests/test-upgrade.yml

@@ -1,40 +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-install-openstack-hosts.yml
-- include: common/test-setup-host.yml
-
-# Install previous version of RabbitMQ server
-- include: test-install-rabbitmq-server.yml
-  vars:
-    rabbitmq_package_url: "{{ rabbitmq_old_package[ansible_os_family | lower]['rabbitmq_package_url'] }}"
-    rabbitmq_package_sha256: "{{ rabbitmq_old_package[ansible_os_family | lower]['rabbitmq_package_sha256'] }}"
-
-# Run tests
-- include: test-rabbitmq-server-functional.yml
-  vars:
-    rabbitmq_release_version: "3.6.1"
-
-# Perform upgrade of RabbitMQ server (package_version will come
-# from role defaults)
-- include: test-install-rabbitmq-server.yml
-  vars:
-    rabbitmq_upgrade: true
-
-# Run tests
-- include: test-rabbitmq-server-functional.yml
-  vars:
-    rabbitmq_release_version: "3.6.5"

tests/test.yml

@@ -16,11 +16,36 @@
 # Setup the host
 - include: common/test-setup-host.yml
 
-# Install RabbitMQ server
+# Install previous version of RabbitMQ server
 - include: test-install-rabbitmq-server.yml
+  vars:
+    rabbitmq_package_url: "{{ rabbitmq_old_package[ansible_os_family | lower]['rabbitmq_package_url'] }}"
+    rabbitmq_package_sha256: "{{ rabbitmq_old_package[ansible_os_family | lower]['rabbitmq_package_sha256'] }}"
 
 # Run tests
 - include: test-rabbitmq-server-functional.yml
   vars:
-    rabbitmq_release_version: "3.6.5"
+    rabbitmq_release_version: "3.6.1"
 
+# Perform upgrade of RabbitMQ server (package_version will come
+# from role defaults)
+# NOTE(mattt): We disable upgrade testing when package manager == 'yum',
+#              this is due to the following ansible bug:
+#              https://github.com/ansible/ansible-modules-core/pull/4547
+#              This conditional can be removed if/when we upgrade to
+#              ansible 2.2 or the fix is backported to ansible 2.1.
+- include: test-install-rabbitmq-server.yml
+  when: ansible_pkg_mgr != 'yum'
+  vars:
+    rabbitmq_upgrade: true
+
+# Run tests
+# NOTE(mattt): We disable upgrade testing when package manager == 'yum',
+#              this is due to the following ansible bug:
+#              https://github.com/ansible/ansible-modules-core/pull/4547
+#              This conditional can be removed if/when we upgrade to
+#              ansible 2.2 or the fix is backported to ansible 2.1.
+- include: test-rabbitmq-server-functional.yml
+  when: ansible_pkg_mgr != 'yum'
+  vars:
+    rabbitmq_release_version: "3.6.5"