Prepare 4.0.0 release.

ansible-collections · Sep 24, 2024 · e6df0d7 · e6df0d7
1 parent d478174
commit e6df0d7
Show file tree

Hide file tree

Showing 63 changed files with 42 additions and 2,468 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -99,17 +99,6 @@ stages:
               test: '2.16/sanity/1'
             - name: Units
               test: '2.16/units/1'
-  - stage: Ansible_2_15
-    displayName: Sanity & Units 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: '2.15/sanity/1'
-            - name: Units
-              test: '2.15/units/1'
 
 ### Docker
   - stage: Docker_devel
@@ -131,7 +120,6 @@ stages:
           groups:
             - 4
             - 5
-            # - 6  -- some images no longer work with docker-compose v1
   - stage: Docker_2_18
     displayName: Docker 2.18
     dependsOn: []
@@ -145,7 +133,6 @@ stages:
           groups:
             - 4
             - 5
-            # - 6  -- some images no longer work with docker-compose v1
   - stage: Docker_2_17
     displayName: Docker 2.17
     dependsOn: []
@@ -163,7 +150,6 @@ stages:
           groups:
             - 4
             - 5
-            - 6
   - stage: Docker_2_16
     displayName: Docker 2.16
     dependsOn: []
@@ -183,23 +169,6 @@ stages:
           groups:
             - 4
             - 5
-            - 6
-  - stage: Docker_2_15
-    displayName: Docker 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/linux/{0}
-          targets:
-            - name: Fedora 37
-              test: fedora37
-            - name: CentOS 7
-              test: centos7
-          groups:
-            - 4
-            - 5
-            - 6
 
 ### Community Docker
   - stage: Docker_community_devel
@@ -219,7 +188,6 @@ stages:
           groups:
             - 4
             - 5
-            - 6
 
 ### Remote
   - stage: Remote_devel
@@ -238,7 +206,6 @@ stages:
             - 3
             - 4
             - 5
-            # - 6  -- Docker 26 no longer works with docker-compose v1
   - stage: Remote_2_18
     displayName: Remote 2.18
     dependsOn: []
@@ -255,7 +222,6 @@ stages:
             - 3
             - 4
             - 5
-            # - 6  -- Docker 26 no longer works with docker-compose v1
   - stage: Remote_2_17
     displayName: Remote 2.17
     dependsOn: []
@@ -272,7 +238,6 @@ stages:
             - 3
             - 4
             - 5
-            # - 6  -- Docker 26 no longer works with docker-compose v1
   - stage: Remote_2_16
     displayName: Remote 2.16
     dependsOn: []
@@ -286,24 +251,6 @@ stages:
             # Currently always hangs in group 2
             # - name: RHEL 8.8
             #   test: rhel/8.8
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
-  - stage: Remote_2_15
-    displayName: Remote 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/{0}
-          targets:
-            - name: RHEL 9.1
-              test: rhel/9.1
-            - name: RHEL 8.7
-              test: rhel/8.7
             - name: RHEL 7.9
               test: rhel/7.9
           groups:
@@ -322,17 +269,14 @@ stages:
       - Ansible_2_18
       - Ansible_2_17
       - Ansible_2_16
-      - Ansible_2_15
       - Remote_devel
       - Remote_2_18
       - Remote_2_17
       - Remote_2_16
-      - Remote_2_15
       - Docker_devel
       - Docker_2_18
       - Docker_2_17
       - Docker_2_16
-      - Docker_2_15
       - Docker_community_devel
     jobs:
       - template: templates/coverage.yml
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -29,10 +29,7 @@ jobs:
     strategy:
       matrix:
         ansible:
-          - '2.11'
-          - '2.12'
-          - '2.13'
-          - '2.14'
+          - '2.15'
     # Ansible-test on various stable branches does not yet work well with cgroups v2.
     # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
     # image for these stable branches. The list of branches where this is necessary will
@@ -71,10 +68,7 @@ jobs:
       fail-fast: true
       matrix:
         ansible:
-          - '2.11'
-          - '2.12'
-          - '2.13'
-          - '2.14'
+          - '2.15'
 
     steps:
       - name: Perform unit testing against Ansible version ${{ matrix.ansible }}
@@ -118,107 +112,15 @@ jobs:
         exclude:
           - ansible: ''
         include:
-          # 2.11
-          - ansible: '2.11'
-            docker: alpine3
+          # 2.15
+          - ansible: '2.15'
+            docker: fedora37
             python: ''
             target: azp/4/
-            extra-constraints: urllib3 < 2.0.0
-          - ansible: '2.11'
-            docker: alpine3
+          - ansible: '2.15'
+            docker: fedora37
             python: ''
             target: azp/5/
-          - ansible: '2.11'
-            docker: alpine3
-            python: ''
-            target: azp/6/
-          # 2.12
-          - ansible: '2.12'
-            docker: fedora33
-            python: ''
-            target: azp/4/
-          - ansible: '2.12'
-            docker: fedora33
-            python: ''
-            target: azp/5/
-          - ansible: '2.12'
-            docker: fedora33
-            python: ''
-            target: azp/6/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/4/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/5/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/6/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/4/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/5/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/6/
-          # 2.13
-          - ansible: '2.13'
-            docker: fedora35
-            python: ''
-            target: azp/4/
-          - ansible: '2.13'
-            docker: fedora35
-            python: ''
-            target: azp/5/
-          - ansible: '2.13'
-            docker: fedora35
-            python: ''
-            target: azp/6/
-          - ansible: '2.13'
-            docker: opensuse15py2
-            python: ''
-            target: azp/4/
-          - ansible: '2.13'
-            docker: opensuse15py2
-            python: ''
-            target: azp/5/
-          - ansible: '2.13'
-            docker: opensuse15py2
-            python: ''
-            target: azp/6/
-          - ansible: '2.13'
-            docker: alpine3
-            python: ''
-            target: azp/4/
-          - ansible: '2.13'
-            docker: alpine3
-            python: ''
-            target: azp/5/
-          - ansible: '2.13'
-            docker: alpine3
-            python: ''
-            target: azp/6/
-          # 2.14
-          - ansible: '2.14'
-            docker: alpine3
-            python: ''
-            target: azp/4/
-          - ansible: '2.14'
-            docker: alpine3
-            python: ''
-            target: azp/5/
-          - ansible: '2.14'
-            docker: alpine3
-            python: ''
-            target: azp/6/
 
     steps:
       - name: Perform integration testing against Ansible version ${{ matrix.ansible }} under Python ${{ matrix.python }}

diff --git a/.github/workflows/ee.yml b/.github/workflows/ee.yml
@@ -57,19 +57,6 @@ jobs:
             ansible_runner: ansible-runner
             base_image: quay.io/rockylinux/rockylinux:9
             pre_base: '"#"'
-          - name: ansible-core 2.14 @ CentOS Stream 9
-            ansible_core: https://github.com/ansible/ansible/archive/stable-2.14.tar.gz
-            ansible_runner: ansible-runner
-            base_image: quay.io/centos/centos:stream9
-            pre_base: '"#"'
-          - name: ansible-core 2.13 @ RHEL UBI 8
-            ansible_core: https://github.com/ansible/ansible/archive/stable-2.13.tar.gz
-            ansible_runner: ansible-runner
-            other_deps: |2
-                python_interpreter:
-                  package_system: python39 python39-pip python39-wheel python39-cryptography
-            base_image: docker.io/redhat/ubi8:latest
-            pre_base: '"#"'
     runs-on: ubuntu-latest
     steps:
       - name: Check out code

diff --git a/README.md b/README.md
@@ -37,9 +37,7 @@ For more information about communication, see the [Ansible communication guide](
 
 ## Tested with Ansible
 
-Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15, ansible-core 2.16, ansible-core 2.17, and ansible-core 2.18 releases, and the current development version of ansible-core. Ansible/ansible-base versions before 2.11.0 are not supported.
-
-Please note that Ansible 2.9 and ansible-base 2.10 are no longer supported. If you need to use them, use community.docker 2.x.y. Also note that this collection does not work with ansible-core 2.11 (this includes ansible-base and Ansible 2.9) on Python 3.12+.
+Tested with the current ansible-core 2.15, ansible-core 2.16, ansible-core 2.17, and ansible-core 2.18 releases, and the current development version of ansible-core. Ansible/ansible-base versions before 2.15.0 are not supported.
 
 ## External requirements
 

diff --git a/changelogs/fragments/4.0.0.yml b/changelogs/fragments/4.0.0.yml
@@ -0,0 +1,9 @@
+release_summary: Major release with removed deprecated features.
+removed_features:
+  - "The collection no longer supports ansible-core 2.11, 2.12, 2.13, and 2.14. You need ansible-core 2.15.0 or newer to use community.docker 4.x.y (https://github.com/ansible-collections/community.docker/pull/971)."
+  - "The docker_compose module has been removed. Please migrate to community.docker.docker_compose_v2 (https://github.com/ansible-collections/community.docker/pull/971)."
+  - "various modules and plugins - remove the ``ssl_version`` option (https://github.com/ansible-collections/community.docker/pull/971)."
+  - "docker_container - the ``ignore_image`` option has been removed. Use ``image: ignore`` in ``comparisons`` instead (https://github.com/ansible-collections/community.docker/pull/971)."
+  - "docker_container - the ``purge_networks`` option has been removed. Use ``networks: strict`` in ``comparisons`` instead and make sure that ``networks`` is specified (https://github.com/ansible-collections/community.docker/pull/971)."
+breaking_changes:
+  - "docker_container - the default of ``image_name_mismatch`` changed from ``ignore`` to ``recreate`` (https://github.com/ansible-collections/community.docker/pull/971)."
diff --git a/galaxy.yml b/galaxy.yml
@@ -7,7 +7,7 @@
 
 namespace: community
 name: docker
-version: 3.13.0
+version: 4.0.0
 readme: README.md
 authors:
   - Ansible Docker Working Group

diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -3,10 +3,9 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-requires_ansible: '>=2.11.0'
+requires_ansible: '>=2.15.0'
 action_groups:
   docker:
-    - docker_compose
     - docker_compose_v2
     - docker_compose_v2_pull
     - docker_config
@@ -45,6 +44,6 @@ action_groups:
 plugin_routing:
   modules:
     docker_compose:
-      deprecation:
+      tombstone:
         removal_version: 4.0.0
         warning_text: This module uses docker-compose v1, which is End of Life since July 2022. Please migrate to community.docker.docker_compose_v2.
diff --git a/plugins/connection/docker_api.py b/plugins/connection/docker_api.py
@@ -21,7 +21,6 @@
       with Python's C(SSLSocket)s. See U(https://github.com/ansible-collections/community.docker/issues/605) for more information.
 extends_documentation_fragment:
     - community.docker.docker.api_documentation
-    - community.docker.docker.ssl_version_deprecation
     - community.docker.docker.var_names
 options:
     remote_user: