From caedcc3075c013a358c70db5c9860536abcf00e1 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 29 Mar 2022 07:03:35 +0200 Subject: [PATCH] Add stable-2.13 to CI, thin out older version matrix (#4413) * Add stable-2.13 to CI, thin out older version matrix. * Thin out matrix more. * And a bit more. --- .azure-pipelines/azure-pipelines.yml | 92 ++++++++++++++++++++++------ README.md | 2 +- tests/sanity/ignore-2.14.txt | 50 +++++++++++++++ 3 files changed, 124 insertions(+), 20 deletions(-) create mode 100644 tests/sanity/ignore-2.14.txt diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 99767c6d52..dbad30beda 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -69,6 +69,19 @@ stages: - test: 3 - test: 4 - test: extra + - stage: Sanity_2_13 + displayName: Sanity 2.13 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: Test {0} + testFormat: 2.13/sanity/{0} + targets: + - test: 1 + - test: 2 + - test: 3 + - test: 4 - stage: Sanity_2_12 displayName: Sanity 2.12 dependsOn: [] @@ -138,6 +151,19 @@ stages: - test: 3.8 - test: 3.9 - test: '3.10' + - stage: Units_2_13 + displayName: Units 2.13 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: Python {0} + testFormat: 2.13/units/{0}/1 + targets: + - test: 2.7 + - test: 3.6 + - test: 3.8 + - test: 3.9 - stage: Units_2_12 displayName: Units 2.12 dependsOn: [] @@ -148,12 +174,8 @@ stages: testFormat: 2.12/units/{0}/1 targets: - test: 2.6 - - test: 2.7 - test: 3.5 - - test: 3.6 - - test: 3.7 - test: 3.8 - - test: '3.10' - stage: Units_2_11 displayName: Units 2.11 dependsOn: [] @@ -166,9 +188,6 @@ stages: - test: 2.6 - test: 2.7 - test: 3.5 - - test: 3.6 - - test: 3.7 - - test: 3.8 - test: 3.9 - stage: Units_2_10 displayName: Units 2.10 @@ -191,11 +210,7 @@ stages: testFormat: 2.9/units/{0}/1 targets: - test: 2.6 - - test: 2.7 - test: 3.5 - - test: 3.6 - - test: 3.7 - - test: 3.8 ## Remote - stage: Remote_devel @@ -220,6 +235,22 @@ stages: - 1 - 2 - 3 + - stage: Remote_2_13 + displayName: Remote 2.13 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.13/{0} + targets: + - name: macOS 12.0 + test: macos/12.0 + - name: RHEL 8.5 + test: rhel/8.5 + groups: + - 1 + - 2 + - 3 - stage: Remote_2_12 displayName: Remote 2.12 dependsOn: [] @@ -316,6 +347,22 @@ stages: - 1 - 2 - 3 + - stage: Docker_2_13 + displayName: Docker 2.13 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.13/linux/{0} + targets: + - name: Fedora 35 + test: fedora35 + - name: Alpine 3 + test: alpine3 + groups: + - 1 + - 2 + - 3 - stage: Docker_2_12 displayName: Docker 2.12 dependsOn: [] @@ -328,8 +375,6 @@ stages: test: centos6 - name: Fedora 34 test: fedora34 - - name: openSUSE 15 py3 - test: opensuse15 - name: Ubuntu 20.04 test: ubuntu2004 groups: @@ -344,12 +389,8 @@ stages: parameters: testFormat: 2.11/linux/{0} targets: - - name: CentOS 7 - test: centos7 - name: Fedora 33 test: fedora33 - - name: openSUSE 15 py2 - test: opensuse15py2 - name: Alpine 3 test: alpine3 groups: @@ -380,8 +421,6 @@ stages: targets: - name: Fedora 31 test: fedora31 - - name: openSUSE 15 py3 - test: opensuse15 groups: - 2 - 3 @@ -417,6 +456,16 @@ stages: testFormat: devel/cloud/{0}/1 targets: - test: 2.7 + - test: '3.10' + - stage: Cloud_2_13 + displayName: Cloud 2.13 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: Python {0} + testFormat: 2.13/cloud/{0}/1 + targets: - test: 3.9 - stage: Cloud_2_12 displayName: Cloud 2.12 @@ -466,26 +515,31 @@ stages: - Sanity_2_10 - Sanity_2_11 - Sanity_2_12 + - Sanity_2_13 - Units_devel - Units_2_9 - Units_2_10 - Units_2_11 - Units_2_12 + - Units_2_13 - Remote_devel - Remote_2_9 - Remote_2_10 - Remote_2_11 - Remote_2_12 + - Remote_2_13 - Docker_devel - Docker_2_9 - Docker_2_10 - Docker_2_11 - Docker_2_12 + - Docker_2_13 - Docker_community_devel - Cloud_devel - Cloud_2_9 - Cloud_2_10 - Cloud_2_11 - Cloud_2_12 + - Cloud_2_13 jobs: - template: templates/coverage.yml diff --git a/README.md b/README.md index 1f391ab11b..c7a22e5aa7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you encounter abusive behavior violating the [Ansible Code of Conduct](https: ## Tested with Ansible -Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported. +Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported. Parts of this collection will not work with ansible-core before 2.12 (this includes ansible-base and Ansible 2.9) on Python 3.12+. diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt new file mode 100644 index 0000000000..572451ae21 --- /dev/null +++ b/tests/sanity/ignore-2.14.txt @@ -0,0 +1,50 @@ +.azure-pipelines/scripts/publish-codecov.py replace-urlopen +plugins/modules/cloud/lxc/lxc_container.py use-argspec-type-path +plugins/modules/cloud/lxc/lxc_container.py validate-modules:use-run-command-not-popen +plugins/modules/cloud/misc/rhevm.py validate-modules:parameter-state-invalid-choice +plugins/modules/cloud/rackspace/rax.py use-argspec-type-path # fix needed +plugins/modules/cloud/rackspace/rax_files.py validate-modules:parameter-state-invalid-choice +plugins/modules/cloud/rackspace/rax_files_objects.py use-argspec-type-path +plugins/modules/cloud/rackspace/rax_scaling_group.py use-argspec-type-path # fix needed, expanduser() applied to dict values +plugins/modules/cloud/scaleway/scaleway_organization_info.py validate-modules:return-syntax-error +plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc +plugins/modules/cloud/smartos/vmadm.py validate-modules:undocumented-parameter +plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-list-no-elements +plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-type-not-in-doc +plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:undocumented-parameter +plugins/modules/cloud/univention/udm_share.py validate-modules:parameter-list-no-elements +plugins/modules/cloud/univention/udm_user.py validate-modules:parameter-list-no-elements +plugins/modules/clustering/consul/consul.py validate-modules:doc-missing-type +plugins/modules/clustering/consul/consul.py validate-modules:undocumented-parameter +plugins/modules/clustering/consul/consul_session.py validate-modules:parameter-state-invalid-choice +plugins/modules/packaging/language/composer.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/packaging/language/yarn.py use-argspec-type-path +plugins/modules/packaging/os/apt_rpm.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/packaging/os/homebrew.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/packaging/os/homebrew_cask.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/packaging/os/opkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/packaging/os/pacman.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/packaging/os/redhat_subscription.py validate-modules:return-syntax-error +plugins/modules/packaging/os/slackpkg.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/packaging/os/urpmi.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/packaging/os/xbps.py validate-modules:parameter-invalid # invalid alias - removed in 5.0.0 +plugins/modules/remote_management/hpilo/hpilo_boot.py validate-modules:parameter-type-not-in-doc +plugins/modules/remote_management/hpilo/hpilo_info.py validate-modules:parameter-type-not-in-doc +plugins/modules/remote_management/hpilo/hponcfg.py validate-modules:parameter-type-not-in-doc +plugins/modules/remote_management/manageiq/manageiq_policies.py validate-modules:parameter-state-invalid-choice +plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:doc-choices-do-not-match-spec # missing docs on suboptions +plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:doc-missing-type # missing docs on suboptions +plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:parameter-type-not-in-doc # missing docs on suboptions +plugins/modules/remote_management/manageiq/manageiq_provider.py validate-modules:undocumented-parameter # missing docs on suboptions +plugins/modules/remote_management/manageiq/manageiq_tags.py validate-modules:parameter-state-invalid-choice +plugins/modules/source_control/github/github_deploy_key.py validate-modules:parameter-invalid +plugins/modules/system/gconftool2.py validate-modules:parameter-state-invalid-choice +plugins/modules/system/iptables_state.py validate-modules:undocumented-parameter +plugins/modules/system/osx_defaults.py validate-modules:parameter-state-invalid-choice +plugins/modules/system/parted.py validate-modules:parameter-state-invalid-choice +plugins/modules/system/puppet.py use-argspec-type-path +plugins/modules/system/puppet.py validate-modules:parameter-invalid # invalid alias - removed in 7.0.0 +plugins/modules/system/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path +plugins/modules/system/xfconf.py validate-modules:parameter-state-invalid-choice # state get removed in 5.0.0 +plugins/modules/system/xfconf.py validate-modules:return-syntax-error +plugins/modules/web_infrastructure/jenkins_plugin.py use-argspec-type-path