Merge pull request #508 from saito-hideki/pr/refactoring_ci_remote

[CI] Refactoring CI tests for both remote and container tests SUMMARY Refactored CI tests: Remove tests for Ansible Core 2.10 and 2.11 that already reached EOL. Remote test target of ansible.posix will be the latest version of RHEL8,9 only. The target OS of container tests has been modified, and a few OS have been removed Add Ansible Core 2.16 and new devel branch to container and remote test target. #506 For CI testing, other platforms can be added as needed. ISSUE TYPE CI tests Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None
Refactoring remote and docker CI tests.
2026-05-11 12:02:06 +00:00 · 2023-11-16 04:34:53 +00:00 · 2023-11-16 11:56:08 +09:00 · 2023-08-02 08:29:22 +00:00 · 2023-08-02 16:03:19 +09:00 · 2023-07-06 22:34:53 +00:00
13 changed files with 61 additions and 130 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -36,7 +36,7 @@ variables:
 resources:
  containers:
    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:3.0.0
+      image: quay.io/ansible/azure-pipelines-test-container:4.0.1

 pool: Standard

@@ -51,16 +51,29 @@ stages:
        parameters:
          testFormat: devel/linux/{0}/1
          targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 37
-              test: fedora37
-            - name: openSUSE 15 py3
-              test: opensuse15
+            - name: Fedora 38
+              test: fedora38
            - name: Ubuntu 20.04
              test: ubuntu2004
            - name: Ubuntu 22.04
              test: ubuntu2204
+  - stage: Docker_2_16
+    displayName: Docker 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.16/linux/{0}/1
+          targets:
+            - name: CentOS 7
+              test: centos7
+            - name: Fedora 38
+              test: fedora38
+            - name: Ubuntu 20.04
+              test: ubuntu2004
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+
  - stage: Docker_2_15
    displayName: Docker 2.15
    dependsOn: []
@@ -141,44 +154,6 @@ stages:
              test: ubuntu1804
            - name: Ubuntu 20.04
              test: ubuntu2004
-  - stage: Docker_2_11
-    displayName: Docker 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/linux/{0}/1
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-  - stage: Docker_2_10
-    displayName: Docker 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.10/linux/{0}/1
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 16.04
-              test: ubuntu1604
-            - name: Ubuntu 18.04
-              test: ubuntu1804
  - stage: Docker_2_9
    displayName: Docker 2.9
    dependsOn: []
@@ -209,18 +184,21 @@ stages:
        parameters:
          testFormat: devel/{0}/1
          targets:
-            - name: MacOS 13.2
-              test: macos/13.2
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.7
-              test: rhel/8.7
-            - name: RHEL 9.1
-              test: rhel/9.1
-            - name: FreeBSD 12.4
-              test: freebsd/12.4
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
+            - name: RHEL 9.3
+              test: rhel/9.3
+  - stage: Remote_2_16
+    displayName: Remote 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.16/{0}/1
+          targets:
+            - name: RHEL 8.8
+              test: rhel/8.8
+            - name: RHEL 9.2
+              test: rhel/9.2
+
  - stage: Remote_2_15
    displayName: Remote 2.15
    dependsOn: []
@@ -229,18 +207,12 @@ stages:
        parameters:
          testFormat: 2.15/{0}/1
          targets:
-            - name: MacOS 13.2
-              test: macos/13.2
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.7
              test: rhel/8.7
            - name: RHEL 9.1
              test: rhel/9.1
-            - name: FreeBSD 12.4
-              test: freebsd/12.4
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
  - stage: Remote_2_14
    displayName: Remote 2.14
    dependsOn: []
@@ -249,18 +221,10 @@ stages:
        parameters:
          testFormat: 2.14/{0}/1
          targets:
-            - name: MacOS 12.0
-              test: macos/12.0
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.6
              test: rhel/8.6
-            - name: RHEL 9.0
-              test: rhel/9.0
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
  - stage: Remote_2_13
    displayName: Remote 2.13
    dependsOn: []
@@ -269,16 +233,10 @@ stages:
        parameters:
          testFormat: 2.13/{0}/1
          targets:
-            - name: MacOS 12.0
-              test: macos/12.0
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.5
              test: rhel/8.5
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
  - stage: Remote_2_12
    displayName: Remote 2.12
    dependsOn: []
@@ -287,46 +245,10 @@ stages:
        parameters:
          testFormat: 2.12/{0}/1
          targets:
-            - name: MacOS 11.1
-              test: macos/11.1
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.4
              test: rhel/8.4
-            - name: FreeBSD 12.2
-              test: freebsd/12.2
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
-  - stage: Remote_2_11
-    displayName: Remote 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/{0}/1
-          targets:
-            - name: MacOS 11.1
-              test: macos/11.1
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.3
-              test: rhel/8.3
-            - name: FreeBSD 12.2
-              test: freebsd/12.2
-  - stage: Remote_2_10
-    displayName: Remote 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.10/{0}/1
-          targets:
-            - name: OS X 10.11
-              test: osx/10.11
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.2
-              test: rhel/8.2
  - stage: Remote_2_9
    displayName: Remote 2.9
    dependsOn: []
@@ -335,8 +257,6 @@ stages:
        parameters:
          testFormat: 2.9/{0}/1
          targets:
-            - name: OS X 10.11
-              test: osx/10.11
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.1
@@ -349,10 +269,6 @@ stages:
    dependsOn:
      - Remote_2_9
      - Docker_2_9
-      - Remote_2_10
-      - Docker_2_10
-      - Remote_2_11
-      - Docker_2_11
      - Remote_2_12
      - Docker_2_12
      - Remote_2_13
@@ -361,6 +277,8 @@ stages:
      - Docker_2_14
      - Remote_2_15
      - Docker_2_15
+      - Remote_2_16
+      - Docker_2_16
      - Remote_devel
      - Docker_devel
    jobs:
--- a/changelogs/fragments/466-tests.yml
+++ b/changelogs/fragments/466-tests.yml
@@ -0,0 +1,2 @@
+trivial:
+  - "Fix integration tests so they work with ansible-core devel / 2.16 (https://github.com/ansible-collections/ansible.posix/pull/466)."
--- a/changelogs/fragments/477_ci_update.yml
+++ b/changelogs/fragments/477_ci_update.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - "Drop Python3.9 and update versions of RHEL,Fedora and FreeBSD for ansible-core:devel test(https://github.com/ansible-collections/ansible.posix/issues/476)."
--- a/changelogs/fragments/487_ci_update.yml
+++ b/changelogs/fragments/487_ci_update.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - "Drop FreeBSD12.4 from CI for ansible-core:devel(https://github.com/ansible-collections/ansible.posix/issues/486)."
--- a/changelogs/fragments/508_ci_update.yml
+++ b/changelogs/fragments/508_ci_update.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - "Refactoring remote CI targets."
--- a/changelogs/fragments/test-reqs.yml
+++ b/changelogs/fragments/test-reqs.yml
@@ -0,0 +1,2 @@
+trivial:
+  - "Move Galaxy test requirements from old transitional format in tests/requirements.yml to standard Ansible Galaxy requirements files in tests/integration/requirements.yml and tests/unit/requirements.yml."
--- a/tests/integration/requirements.yml
+++ b/tests/integration/requirements.yml
@@ -0,0 +1,3 @@
+---
+collections:
+- community.general
--- a/tests/integration/targets/acl/tasks/main.yml
+++ b/tests/integration/targets/acl/tasks/main.yml
@@ -17,7 +17,7 @@

 - block:

-  - include: acl.yml
+  - include_tasks: acl.yml
    when: ansible_system == 'Linux'  # TODO enable acls mount option on FreeBSD to test it there too

  always:
--- a/tests/integration/targets/seboolean/tasks/main.yml
+++ b/tests/integration/targets/seboolean/tasks/main.yml
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

- include: seboolean.yml
+- include_tasks: seboolean.yml
  when:
    - ansible_selinux is defined
    - ansible_selinux != False
--- a/tests/integration/targets/selinux/tasks/main.yml
+++ b/tests/integration/targets/selinux/tasks/main.yml
@@ -23,13 +23,13 @@
    msg: SELinux is {{ ansible_selinux.status }}
  when: ansible_selinux is defined and ansible_selinux != False

- include: selinux.yml
+- include_tasks: selinux.yml
  when:
    - ansible_selinux is defined
    - ansible_selinux != False
    - ansible_selinux.status == 'enabled'

- include: selogin.yml
+- include_tasks: selogin.yml
  when:
    - ansible_selinux is defined
    - ansible_selinux != False
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -1,4 +0,0 @@
-integration_tests_dependencies:
- community.general
-unit_tests_dependencies:
- community.general
--- a/tests/unit/requirements.yml
+++ b/tests/unit/requirements.yml
@@ -0,0 +1,3 @@
+---
+collections:
+- community.general
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -145,9 +145,7 @@ function cleanup
        fi

        if [ "${process_coverage}" ]; then
-            # use python 3.9 for coverage to avoid running out of memory during coverage xml processing
-            # only use it for coverage to avoid the additional overhead of setting up a virtual environment for a potential no-op job
-            virtualenv --python /usr/bin/python3.9 ~/ansible-venv
+            python3 -m venv ~/ansible-venv
            set +ux
            . ~/ansible-venv/bin/activate
            set -ux
Author	SHA1	Message	Date
softwarefactory-project-zuul[bot]	2f699307c7	Merge pull request #508 from saito-hideki/pr/refactoring_ci_remote [CI] Refactoring CI tests for both remote and container tests SUMMARY Refactored CI tests: Remove tests for Ansible Core 2.10 and 2.11 that already reached EOL. Remote test target of ansible.posix will be the latest version of RHEL8,9 only. The target OS of container tests has been modified, and a few OS have been removed Add Ansible Core 2.16 and new devel branch to container and remote test target. #506 For CI testing, other platforms can be added as needed. ISSUE TYPE CI tests Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2023-11-16 04:34:53 +00:00
Hideki Saito	7dd5087e7b	Refactoring remote and docker CI tests. * Removed tests for Ansible Core 2.10 and 2.11 fromn remote and container targets * Modoifed remote and container test target OS * Fixed #506 Signed-off-by: Hideki Saito <saito@fgrep.org>	2023-11-16 11:56:08 +09:00
softwarefactory-project-zuul[bot]	542643e786	Merge pull request #487 from saito-hideki/pr/ci_remove_freebsd12 Drop OSX10.11 and FreeBSD12.4 from CI SUMMARY Drop OSX-10.11 and FreeBSD12.4 from CI Fixes #476 Fixes #486 Drop OSX10.11 from ansible:2.9 and ansible-core:2.10 Drop FreeBSD12.4 from ansible-core:devel ISSUE TYPE CI Tests Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2023-08-02 08:29:22 +00:00
Hideki Saito	2cde4cdb26	Drop OSX10.11 and FreeBSD12.4 from CI - Fixes #476 - Fixes #486 - Drop OSX10.11 from ansible:2.9 and ansible-core:2.10 - Drop FreeBSD12.4 from ansible-core:devel Signed-off-by: Hideki Saito <saito@fgrep.org> test	2023-08-02 16:03:19 +09:00
softwarefactory-project-zuul[bot]	12a1c25f5e	Merge pull request #478 from maxamillion/test/rhel_updates Update azure-pipelines for new RHEL versions SUMMARY Change to the CI system annnounced in the following required this change: ansible-collections/news-for-maintainers#47	2023-07-06 22:34:53 +00:00
Adam Miller	7062be892e	only for devel Signed-off-by: Adam Miller <admiller@redhat.com>	2023-07-06 10:19:58 -05:00
softwarefactory-project-zuul[bot]	20c2c30d23	Merge pull request #477 from saito-hideki/issue/476/1 Update CI tests to address changes on ansible-core SUMMARY Replace Python3.9 with 3.12 for ansible-test Addresses issue #476 ISSUE TYPE CI Test Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2023-07-04 01:39:12 +00:00
Hideki Saito	4f1e6b4a6d	Drop Python3.9 and update versions of RHEL,Fedora and FreeBSD for ansible-core:devel * Addresses issue #476 * Drop Python3.9 * Replace Fedora 37 with 38 * Replace FreeBSD13.1 with 13.2 * Replace RHEL 8.7 with 8.8 * Replace RHEL 9.1 with 9.2 Signed-off-by: Hideki Saito <saito@fgrep.org>	2023-07-04 09:15:24 +09:00
Adam Miller	806ab9ef9d	Update azure-pipelines for new RHEL versions Change to the CI system annnounced in the following required this change: https://github.com/ansible-collections/news-for-maintainers/issues/47 Signed-off-by: Adam Miller <admiller@redhat.com>	2023-06-29 10:57:49 -05:00
softwarefactory-project-zuul[bot]	2ed8bdc8e8	Merge pull request #465 from felixfontein/req Switch to Ansible Galaxy compatible requirements files for tests SUMMARY See ansible-community/community-topics#230. ISSUE TYPE Test Pull Request COMPONENT NAME test requirements files Reviewed-by: Sorin Sbarnea <sorin.sbarnea@gmail.com>	2023-05-31 14:01:42 +00:00
Felix Fontein	622aef2aad	Switch to Ansible Galaxy compatible requirements files for tests.	2023-05-26 08:14:28 +02:00
softwarefactory-project-zuul[bot]	5165572e9e	Merge pull request #467 from oraNod/rm-eol-tests Fix CI: Remove FreeBSD 12.2 targets SUMMARY Removes CI tests for FreeBSD 12.2 that are failing when trying to bootstrap http://pkg.freebsd.org/FreeBSD:12:amd64/release_2 Example PR affected #466 ISSUE TYPE Bugfix Pull Request COMPONENT NAME .azure-pipelines/azure-pipelines.yml ADDITIONAL INFORMATION N/A Reviewed-by: Hideki Saito <saito@fgrep.org>	2023-05-26 06:09:47 +00:00
softwarefactory-project-zuul[bot]	6c46a924b9	Merge pull request #466 from felixfontein/ci Fix CI: replace `include:` with `include_tasks:` SUMMARY include: is removed for ansible-core 2.16 and no longer works with current devel. ISSUE TYPE Test Pull Request COMPONENT NAME integration tests Reviewed-by: Hideki Saito <saito@fgrep.org>	2023-05-26 05:09:48 +00:00
Don Naro	ab1bc5df9f	remove FreeBSD 12.2 targets	2023-05-24 19:41:58 +01:00
Felix Fontein	4106ec65f9	Replace 'include:' with 'include_tasks:'. 'include:' is removed for ansible-core 2.16.	2023-05-21 13:17:48 +02:00