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. The associated
   scripts are also removed.
2. We consolidate test-vars.yml and the overrides into a single
   file to conform to the standard in other roles and ensure
   that the overrides are only set in one place.

Change-Id: I2dcb1576a75c4d09c6d99e1369775301e99df770

tests/ansible-role-requirements.yml

@@ -18,7 +18,3 @@
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
   scm: git
   version: master
-- name: previous_qdrouterd_server
-  src: https://github.com/ajssmith/ansible-qdrouterd
-  scm: git
-  version: master

tests/qdrouterd-overrides.yml

@@ -1,2 +1,21 @@
+---
+# Copyright 2018, Red Hat, 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.
+
 qdrouterd_ssl_cert: /etc/qpid-dispatch/ssl/qdrouterd.pem
 qdrouterd_ssl_key: /etc/qpid-dispatch/ssl/qdrouterd.key
+qdrouterd_worker_threads: 2
+qdrouterd_require_ssl: no
+qdrouterd_listener_port: 31459
+qdrouterd_irl_port: 31460

tests/test-install-previous-qdrouterd.yml

@@ -1,31 +0,0 @@
----
-# Copyright 2018, Red Hat, 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: Gather facts
-  hosts: "all"
-  user: root
-  gather_facts: true
-
-# Install previous version
-- name: Deploy previous qdrouterd version
-  hosts: qdrouterd_all
-  user: root
-  serial: 1
-  any_errors_fatal: true
-  gather_facts: true
-  roles:
-    - role: "previous_qdrouterd_server"
-  vars_files:
-    - common/previous/test-vars.yml

tests/test-install-qdrouterd.yml

@@ -27,5 +27,3 @@
   any_errors_fatal: true
   roles:
     - role: "qdrouterd"
-  vars_files:
-    - test-vars.yml

tests/test-upgrade-post.yml

@@ -1,20 +0,0 @@
----
-# Copyright 2018, Red Hat, 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 Qdrouterd server
-- include: common/test-install-qdrouterd.yml
-
-# Run functional tests
-- include: test-qdrouterd-functional.yml

tests/test-upgrade-pre.yml

@@ -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
-- include: common/test-setup-host.yml

tests/test-vars.yml

@@ -1,19 +0,0 @@
----
-# Copyright 2018, Red Hat, 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.
-
-qdrouterd_worker_threads: 2
-qdrouterd_require_ssl: no
-qdrouterd_listener_port: 31459
-qdrouterd_irl_port: 31460

tox.ini

@@ -86,15 +86,6 @@ commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
 
-[testenv:upgrade]
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_OVERRIDES={toxinidir}/tests/qdrouterd-overrides.yml
-    CLONE_UPGRADE_TESTS=yes
-commands =
-    bash -c "{toxinidir}/tests/test-qdrouterd-upgrades.sh"
-
-
 [testenv:linters]
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"

zuul.d/project.yaml

@@ -22,8 +22,6 @@
             voting: false
         - openstack-ansible-functional-ubuntu-xenial:
             voting: false
-        - openstack-ansible-upgrade-ubuntu-xenial:
-            voting: false
     experimental:
       jobs:
         - openstack-ansible-integrated-deploy-aio