diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index cf493cf3..2b9864c9 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -55,6 +55,17 @@ stages: test: 'devel/sanity/extra' - name: Units test: 'devel/units/1' + - stage: Ansible_2_11 + displayName: Sanity & Units 2.11 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + targets: + - name: Sanity + test: '2.11/sanity/1' + - name: Units + test: '2.11/units/1' - stage: Ansible_2_10 displayName: Sanity & Units 2.10 dependsOn: [] @@ -105,6 +116,25 @@ stages: groups: - 4 - 5 + - stage: Docker_2_11 + displayName: Docker 2.11 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.11/linux/{0} + targets: + - name: CentOS 8 + test: centos8 + - name: Fedora 33 + test: fedora33 + - name: openSUSE 15 py3 + test: opensuse15 + - name: Ubuntu 20.04 + test: ubuntu2004 + groups: + - 4 + - 5 - stage: Docker_2_10 displayName: Docker 2.10 dependsOn: [] @@ -117,16 +147,12 @@ stages: test: centos7 - name: CentOS 8 test: centos8 - - name: Fedora 31 - test: fedora31 - name: Fedora 32 test: fedora32 - name: openSUSE 15 py2 test: opensuse15py2 - name: openSUSE 15 py3 test: opensuse15 - - name: Ubuntu 16.04 - test: ubuntu1604 - name: Ubuntu 18.04 test: ubuntu1804 groups: @@ -142,19 +168,12 @@ stages: targets: - name: CentOS 7 test: centos7 - - name: CentOS 8 - test: centos8 - name: Fedora 31 test: fedora31 - - name: openSUSE 15 py2 test: opensuse15py2 - - name: openSUSE 15 py3 - test: opensuse15 - name: Ubuntu 16.04 test: ubuntu1604 - - name: Ubuntu 18.04 - test: ubuntu1804 groups: - 4 - 5 @@ -176,6 +195,22 @@ stages: - 3 - 4 - 5 + - stage: Remote_2_11 + displayName: Remote 2.11 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: RHEL {0} + testFormat: 2.11/rhel/{0} + targets: + - test: '8.3' + groups: + - 1 + - 2 + - 3 + - 4 + - 5 - stage: Remote_2_10 displayName: Remote 2.10 dependsOn: [] @@ -186,7 +221,6 @@ stages: testFormat: 2.10/rhel/{0} targets: - test: '7.8' - - test: '8.2' groups: - 1 - 2 @@ -214,10 +248,13 @@ stages: condition: succeededOrFailed() dependsOn: - Ansible_devel + - Ansible_2_11 - Ansible_2_10 - Ansible_2_9 - Remote_devel - Docker_devel + - Remote_2_11 + - Docker_2_11 - Remote_2_10 - Docker_2_10 - Remote_2_9 diff --git a/README.md b/README.md index e501b4fe..0085f47b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This repo contains the `community.docker` Ansible Collection. The collection inc ## Tested with Ansible -Tested with the current Ansible 2.9 and 2.10 releases and the current development version of Ansible. Ansible versions before 2.9.10 are not supported. +Tested with the current Ansible 2.9, ansible-base 2.10 and ansible-core 2.11 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported. ## External requirements diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt new file mode 100644 index 00000000..e678db7a --- /dev/null +++ b/tests/sanity/ignore-2.12.txt @@ -0,0 +1,3 @@ +plugins/modules/docker_container.py use-argspec-type-path # uses colon-separated paths, can't use type=path +tests/utils/shippable/check_matrix.py replace-urlopen +tests/utils/shippable/timing.py shebang