From cdce0f5218178af3e2af674438bd050a6392ae22 Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Mon, 18 May 2026 01:58:03 +0900 Subject: [PATCH] Replace CI with the main branch (#722) - Add 2.21 stages (Sanity, Docker, Remote) - Update distro versions (Fedora 44, RHEL 10.1/9.7, FreeBSD 14.4/15.0) - Remove CentOS 7 from Docker 2.16 - Add 2.21 to Summary stage dependencies - Backport #718 --- .azure-pipelines/azure-pipelines.yml | 120 ++++++++++++++++++++------- tests/sanity/ignore-2.14.txt | 2 - tests/sanity/ignore-2.15.txt | 2 - tests/sanity/ignore-2.22.txt | 10 +++ tests/unit/requirements.txt | 42 ---------- 5 files changed, 102 insertions(+), 74 deletions(-) delete mode 100644 tests/sanity/ignore-2.14.txt delete mode 100644 tests/sanity/ignore-2.15.txt create mode 100644 tests/sanity/ignore-2.22.txt diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index cedf9ed..96ea43e 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -57,6 +57,23 @@ stages: test: units - name: Lint test: lint + + - stage: Sanity_2_21 + displayName: Ansible 2.21 Sanity & Units & Lint + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: "{0}" + testFormat: 2.21/{0} + targets: + - name: Sanity + test: sanity + - name: Units + test: units + - name: Lint + test: lint + - stage: Sanity_2_20 displayName: Ansible 2.20 Sanity & Units & Lint dependsOn: [] @@ -72,6 +89,7 @@ stages: test: units - name: Lint test: lint + - stage: Sanity_2_19 displayName: Ansible 2.19 Sanity & Units & Lint dependsOn: [] @@ -87,6 +105,7 @@ stages: test: units - name: Lint test: lint + - stage: Sanity_2_18 displayName: Ansible 2.18 Sanity & Units & Lint dependsOn: [] @@ -102,6 +121,7 @@ stages: test: units - name: Lint test: lint + - stage: Sanity_2_17 displayName: Ansible 2.17 Sanity & Units & Lint dependsOn: [] @@ -117,6 +137,8 @@ stages: test: units - name: Lint test: lint + + # 2.16 is LTS - stage: Sanity_2_16 displayName: Ansible 2.16 Sanity & Units & Lint dependsOn: [] @@ -132,6 +154,7 @@ stages: test: units - name: Lint test: lint + ## Docker - stage: Docker_devel displayName: Docker devel @@ -141,12 +164,28 @@ stages: parameters: testFormat: devel/linux/{0}/1 targets: - - name: Fedora 42 - test: fedora42 + - name: Fedora 44 + test: fedora44 + - name: Ubuntu 24.04 + test: ubuntu2404 + - name: Ubuntu 26.04 + test: ubuntu2604 + + - stage: Docker_2_21 + displayName: Docker 2.21 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.21/linux/{0}/1 + targets: + - name: Fedora 43 + test: fedora43 - name: Ubuntu 22.04 test: ubuntu2204 - name: Ubuntu 24.04 test: ubuntu2404 + - stage: Docker_2_20 displayName: Docker 2.20 dependsOn: [] @@ -161,6 +200,7 @@ stages: test: ubuntu2204 - name: Ubuntu 24.04 test: ubuntu2404 + - stage: Docker_2_19 displayName: Docker 2.19 dependsOn: [] @@ -175,6 +215,7 @@ stages: test: ubuntu2204 - name: Ubuntu 24.04 test: ubuntu2404 + - stage: Docker_2_18 displayName: Docker 2.18 dependsOn: [] @@ -189,6 +230,7 @@ stages: test: ubuntu2204 - name: Ubuntu 24.04 test: ubuntu2404 + - stage: Docker_2_17 displayName: Docker 2.17 dependsOn: [] @@ -201,6 +243,7 @@ stages: test: fedora39 - name: Ubuntu 22.04 test: ubuntu2204 + - stage: Docker_2_16 displayName: Docker 2.16 dependsOn: [] @@ -209,8 +252,6 @@ stages: parameters: testFormat: 2.16/linux/{0}/1 targets: - - name: CentOS 7 - test: centos7 - name: Fedora 38 test: fedora38 - name: Ubuntu 22.04 @@ -225,14 +266,32 @@ stages: parameters: testFormat: devel/{0}/1 targets: - - name: RHEL 10.0 - test: rhel/10.0 - - name: RHEL 9.6 - test: rhel/9.6 - - name: FreeBSD 14.3 - test: freebsd/14.3 - - name: FreeBSD 13.5 - test: freebsd/13.5 + - name: RHEL 10.1 + test: rhel/10.1 + - name: RHEL 9.7 + test: rhel/9.7 + - name: FreeBSD 14.4 + test: freebsd/14.4 + - name: FreeBSD 15.0 + test: freebsd/15.0 + + - stage: Remote_2_21 + displayName: Remote 2.21 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.21/{0}/1 + targets: + - name: RHEL 10.1 + test: rhel/10.1 + - name: RHEL 9.7 + test: rhel/9.7 + - name: FreeBSD 14.4 + test: freebsd/14.4 + - name: FreeBSD 15.0 + test: freebsd/15.0 + - stage: Remote_2_20 displayName: Remote 2.20 dependsOn: [] @@ -241,14 +300,15 @@ stages: parameters: testFormat: 2.20/{0}/1 targets: - - name: RHEL 10.0 - test: rhel/10.0 - - name: RHEL 9.6 - test: rhel/9.6 + - name: RHEL 10.1 + test: rhel/10.1 + - name: RHEL 9.7 + test: rhel/9.7 - name: FreeBSD 14.3 test: freebsd/14.3 - name: FreeBSD 13.5 test: freebsd/13.5 + - stage: Remote_2_19 displayName: Remote 2.19 dependsOn: [] @@ -257,14 +317,15 @@ stages: parameters: testFormat: 2.19/{0}/1 targets: - - name: RHEL 10.0 - test: rhel/10.0 - - name: RHEL 9.5 - test: rhel/9.5 + - name: RHEL 10.1 + test: rhel/10.1 + - name: RHEL 9.7 + test: rhel/9.7 - name: FreeBSD 14.2 test: freebsd/14.2 - name: FreeBSD 13.5 test: freebsd/13.5 + - stage: Remote_2_18 displayName: Remote 2.18 dependsOn: [] @@ -273,12 +334,13 @@ stages: parameters: testFormat: 2.18/{0}/1 targets: - - name: RHEL 10.0 - test: rhel/10.0 - - name: RHEL 9.4 - test: rhel/9.4 + - name: RHEL 10.1 + test: rhel/10.1 + - name: RHEL 9.7 + test: rhel/9.7 - name: FreeBSD 13.5 test: freebsd/13.5 + - stage: Remote_2_17 displayName: Remote 2.17 dependsOn: [] @@ -287,11 +349,11 @@ stages: parameters: testFormat: 2.17/{0}/1 targets: - # 2.17 remote target doesn't have RHEL 9 image - name: RHEL 10.0 test: rhel/10.0 - name: FreeBSD 13.5 test: freebsd/13.5 + - stage: Remote_2_16 displayName: Remote 2.16 dependsOn: [] @@ -300,9 +362,8 @@ stages: parameters: testFormat: 2.16/{0}/1 targets: - # 2.16 remote target only has RHEL 9.6 image - - name: RHEL 9.6 - test: rhel/9.6 + - name: RHEL 10.1 + test: rhel/10.1 ## Finally @@ -324,6 +385,9 @@ stages: - Sanity_2_20 - Remote_2_20 - Docker_2_20 + - Sanity_2_21 + - Remote_2_21 + - Docker_2_21 - Sanity_devel - Remote_devel - Docker_devel diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt deleted file mode 100644 index caf2217..0000000 --- a/tests/sanity/ignore-2.14.txt +++ /dev/null @@ -1,2 +0,0 @@ -tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt deleted file mode 100644 index caf2217..0000000 --- a/tests/sanity/ignore-2.15.txt +++ /dev/null @@ -1,2 +0,0 @@ -tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.22.txt b/tests/sanity/ignore-2.22.txt new file mode 100644 index 0000000..9b5e162 --- /dev/null +++ b/tests/sanity/ignore-2.22.txt @@ -0,0 +1,10 @@ +tests/utils/shippable/timing.py shebang +plugins/action/synchronize.py pylint:ansible-bad-import-from +plugins/callback/cgroup_perf_recap.py pylint:ansible-bad-import-from +plugins/modules/mount.py pylint:ansible-bad-import-from +plugins/modules/sysctl.py pylint:ansible-bad-import-from +plugins/shell/csh.py pylint:ansible-bad-import-from +plugins/shell/fish.py pylint:ansible-bad-import-from +tests/unit/mock/procenv.py pylint:ansible-bad-import-from +tests/unit/mock/yaml_helper.py pylint:ansible-bad-import-from +tests/unit/modules/conftest.py pylint:ansible-bad-import-from diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt index a9772be..e69de29 100644 --- a/tests/unit/requirements.txt +++ b/tests/unit/requirements.txt @@ -1,42 +0,0 @@ -boto3 -placebo -pycrypto -passlib -pypsrp -python-memcached -pytz -pyvmomi -redis -requests -setuptools > 0.6 # pytest-xdist installed via requirements does not work with very old setuptools (sanity_ok) -unittest2 ; python_version < '2.7' -importlib ; python_version < '2.7' -netaddr -ipaddress -netapp-lib -solidfire-sdk-python - -# requirements for F5 specific modules -f5-sdk ; python_version >= '2.7' -f5-icontrol-rest ; python_version >= '2.7' -deepdiff - -# requirement for Fortinet specific modules -pyFMG - -# requirement for aci_rest module -xmljson - -# requirement for winrm connection plugin tests -pexpect - -# requirement for the linode module -linode-python # APIv3 -linode_api4 ; python_version > '2.6' # APIv4 - -# requirement for the gitlab module -python-gitlab -httmock - -# requirment for kubevirt modules -openshift ; python_version >= '2.7'