Disable docker tests (#1194)

* Disable docker tests. ci_complete * Get rid of shippable groups 4 and 5. Redistribute the few remaining entries of group 4 to groups 1 to 3. ci_complete * Try group 1.
2024-09-14 20:13:21 +02:00 · 2020-10-29 08:02:33 +01:00 · 2020-10-29 08:02:33 +01:00 · 25b38d907e
commit 25b38d907e
parent 20f470cc64
29 changed files with 64 additions and 40 deletions
--- a/shippable.yml
+++ b/shippable.yml
@ -98,39 +98,41 @@ matrix:
    - env: T=devel/linux/ubuntu1604/3
    - env: T=devel/linux/ubuntu1804/3

-    #- env: T=devel/aix/7.2/4
-    - env: T=devel/osx/10.11/4
-    - env: T=devel/macos/10.15/4
-    - env: T=devel/rhel/7.8/4
-    - env: T=devel/rhel/8.2/4
-    - env: T=devel/freebsd/11.1/4
-    - env: T=devel/freebsd/12.1/4
-    - env: T=devel/linux/centos6/4
-    - env: T=devel/linux/centos7/4
-    - env: T=devel/linux/centos8/4
-    - env: T=devel/linux/fedora31/4
-    - env: T=devel/linux/fedora32/4
-    - env: T=devel/linux/opensuse15py2/4
-    - env: T=devel/linux/opensuse15/4
-    - env: T=devel/linux/ubuntu1604/4
-    - env: T=devel/linux/ubuntu1804/4
+    # group 4 is only used by docker and postgresql modules
+    ##- env: T=devel/aix/7.2/4
+    #- env: T=devel/osx/10.11/4
+    #- env: T=devel/macos/10.15/4
+    #- env: T=devel/rhel/7.8/4
+    #- env: T=devel/rhel/8.2/4
+    #- env: T=devel/freebsd/11.1/4
+    #- env: T=devel/freebsd/12.1/4
+    #- env: T=devel/linux/centos6/4
+    #- env: T=devel/linux/centos7/4
+    #- env: T=devel/linux/centos8/4
+    #- env: T=devel/linux/fedora31/4
+    #- env: T=devel/linux/fedora32/4
+    #- env: T=devel/linux/opensuse15py2/4
+    #- env: T=devel/linux/opensuse15/4
+    #- env: T=devel/linux/ubuntu1604/4
+    #- env: T=devel/linux/ubuntu1804/4

-    #- env: T=devel/aix/7.2/5
-    - env: T=devel/osx/10.11/5
-    - env: T=devel/macos/10.15/5
-    - env: T=devel/rhel/7.8/5
-    - env: T=devel/rhel/8.2/5
-    - env: T=devel/freebsd/11.1/5
-    - env: T=devel/freebsd/12.1/5
-    - env: T=devel/linux/centos6/5
-    - env: T=devel/linux/centos7/5
-    - env: T=devel/linux/centos8/5
-    - env: T=devel/linux/fedora31/5
-    - env: T=devel/linux/fedora32/5
-    - env: T=devel/linux/opensuse15py2/5
-    - env: T=devel/linux/opensuse15/5
-    - env: T=devel/linux/ubuntu1604/5
-    - env: T=devel/linux/ubuntu1804/5
+    # group 5 is only used by docker and postgresql modules
+    ##- env: T=devel/aix/7.2/5
+    #- env: T=devel/osx/10.11/5
+    #- env: T=devel/macos/10.15/5
+    #- env: T=devel/rhel/7.8/5
+    #- env: T=devel/rhel/8.2/5
+    #- env: T=devel/freebsd/11.1/5
+    #- env: T=devel/freebsd/12.1/5
+    #- env: T=devel/linux/centos6/5
+    #- env: T=devel/linux/centos7/5
+    #- env: T=devel/linux/centos8/5
+    #- env: T=devel/linux/fedora31/5
+    #- env: T=devel/linux/fedora32/5
+    #- env: T=devel/linux/opensuse15py2/5
+    #- env: T=devel/linux/opensuse15/5
+    #- env: T=devel/linux/ubuntu1604/5
+    #- env: T=devel/linux/ubuntu1804/5

    - env: T=devel/cloud/2.7/1
    - env: T=devel/cloud/3.6/1
@ -141,7 +143,7 @@ matrix:
    - env: T=2.10/linux/centos8/2
    - env: T=2.10/linux/fedora32/3
    - env: T=2.10/linux/opensuse15/3
-    - env: T=2.10/linux/ubuntu1804/4
+    #- env: T=2.10/linux/ubuntu1804/4
    - env: T=2.10/cloud/3.6/1

    #- env: T=2.9/osx/10.11/1
@ -150,7 +152,7 @@ matrix:
    - env: T=2.9/linux/centos8/2
    - env: T=2.9/linux/fedora31/3
    - env: T=2.9/linux/opensuse15/3
-    - env: T=2.9/linux/ubuntu1804/4
+    #- env: T=2.9/linux/ubuntu1804/4
    - env: T=2.9/cloud/3.6/1

 branches:
--- a/tests/integration/targets/connection_docker/aliases
+++ b/tests/integration/targets/connection_docker/aliases
@ -1,2 +1,3 @@
+disabled  # tests already running in community.docker
 non_local
 unsupported
--- a/tests/integration/targets/cronvar/aliases
+++ b/tests/integration/targets/cronvar/aliases
@ -1,5 +1,5 @@
 destructive
-shippable/posix/group4
+shippable/posix/group3
 skip/aix
 skip/osx
 skip/macos
--- a/tests/integration/targets/docker_config/aliases
+++ b/tests/integration/targets/docker_config/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group3
 skip/osx
 skip/macos
--- a/tests/integration/targets/docker_container/aliases
+++ b/tests/integration/targets/docker_container/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group5
 skip/osx
 skip/macos
--- a/tests/integration/targets/docker_container_info/aliases
+++ b/tests/integration/targets/docker_container_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/osx
 skip/macos
--- a/tests/integration/targets/docker_image/aliases
+++ b/tests/integration/targets/docker_image/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group5
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_image_info/aliases
+++ b/tests/integration/targets/docker_image_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_login/aliases
+++ b/tests/integration/targets/docker_login/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group3
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_network/aliases
+++ b/tests/integration/targets/docker_network/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group5
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_network_info/aliases
+++ b/tests/integration/targets/docker_network_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_node/aliases
+++ b/tests/integration/targets/docker_node/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_node_info/aliases
+++ b/tests/integration/targets/docker_node_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group3
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_prune/aliases
+++ b/tests/integration/targets/docker_prune/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_secret/aliases
+++ b/tests/integration/targets/docker_secret/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_stack/aliases
+++ b/tests/integration/targets/docker_stack/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_stack_info/aliases
+++ b/tests/integration/targets/docker_stack_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group1
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_stack_task_info/aliases
+++ b/tests/integration/targets/docker_stack_task_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group1
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_swarm/aliases
+++ b/tests/integration/targets/docker_swarm/aliases
@ -1,5 +1,5 @@
 shippable/posix/group2
-disabled  # See: https://github.com/ansible/ansible/issues/61815
+disabled  # tests already running in community.docker; also, see: https://github.com/ansible/ansible/issues/61815
 skip/aix
 skip/osx
 skip/macos
--- a/tests/integration/targets/docker_swarm_info/aliases
+++ b/tests/integration/targets/docker_swarm_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group1
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_swarm_service/aliases
+++ b/tests/integration/targets/docker_swarm_service/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group5
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_swarm_service_info/aliases
+++ b/tests/integration/targets/docker_swarm_service_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group3
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_volume/aliases
+++ b/tests/integration/targets/docker_volume/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/docker_volume_info/aliases
+++ b/tests/integration/targets/docker_volume_info/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group1
 skip/aix
 skip/osx
--- a/tests/integration/targets/dpkg_divert/aliases
+++ b/tests/integration/targets/dpkg_divert/aliases
@ -1,4 +1,4 @@
-shippable/posix/group4
+shippable/posix/group1
 skip/aix
 skip/osx
 skip/macos
--- a/tests/integration/targets/inventory_docker_machine/aliases
+++ b/tests/integration/targets/inventory_docker_machine/aliases
@ -1,4 +1,4 @@
-disabled
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/inventory_docker_swarm/aliases
+++ b/tests/integration/targets/inventory_docker_swarm/aliases
@ -1,3 +1,4 @@
+disabled  # tests already running in community.docker
 shippable/posix/group2
 skip/aix
 skip/osx
--- a/tests/integration/targets/iptables_state/aliases
+++ b/tests/integration/targets/iptables_state/aliases
@ -1,5 +1,5 @@
 destructive
-shippable/posix/group4
+shippable/posix/group1
 skip/docker             # kernel modules not loadable
 skip/freebsd            # no iptables/netfilter (Linux specific)
 skip/osx                # no iptables/netfilter (Linux specific)
--- a/tests/integration/targets/lookup_passwordstore/aliases
+++ b/tests/integration/targets/lookup_passwordstore/aliases
@ -1,4 +1,4 @@
-shippable/posix/group4
+shippable/posix/group1
 destructive
 skip/aix
 skip/rhel