Test maintained versions of ansible-core.

robertdebock · Jul 22, 2024 · b2cb4a7 · b2cb4a7
1 parent 880c543
commit b2cb4a7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 72 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -22,48 +22,6 @@ jobs:
       - name: ansible-lint
         uses: ansible-community/ansible-lint-action@main
 
-  python-3-8:
-    needs:
-      - lint
-    runs-on: ubuntu-20.04
-    container:
-      image: python:3.8
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - image: "enterpriselinux"
-            tag: "latest"
-          - image: "debian"
-            tag: "latest"
-          - image: "debian"
-            tag: "bullseye"
-          - image: "fedora"
-            tag: "39"
-          - image: "fedora"
-            tag: "latest"
-          - image: "fedora"
-            tag: "rawhide"
-          - image: "ubuntu"
-            tag: "latest"
-          - image: "ubuntu"
-            tag: "jammy"
-          - image: "ubuntu"
-            tag: "focal"
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: molecule
-        run: |
-          apt-get update -qq
-          apt-get -y -qq install yamllint docker.io
-          pip install --no-cache-dir tox
-          if [ -f tox.ini ] ; then tox ; fi
-          if [ ! -f tox.ini ] ; then pip install -r requirements.yml ; pip install ansible-lint ansible-core ; molecule test ; fi
-        env:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
   python-3-9:
     needs:
       - lint

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,31 +17,31 @@ molecule:
     matrix:
       - image: "enterpriselinux"
         tag: "latest"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
       - image: "debian"
         tag: "latest"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
       - image: "debian"
         tag: "bullseye"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
       - image: "fedora"
         tag: "39"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
       - image: "fedora"
         tag: "latest"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
       - image: "fedora"
         tag: "rawhide"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
       - image: "ubuntu"
         tag: "latest"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
       - image: "ubuntu"
         tag: "jammy"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
       - image: "ubuntu"
         tag: "focal"
-        python: ['python:3.8', 'python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10']
 
 galaxy:
   script:

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = ansible-2.{12,13,14,15,16,17}
+envlist = ansible-2.{15,16,17}
 skipsdist = true
 
 [testenv]
@@ -13,26 +13,8 @@ setenv =
 
 passenv = namespace, image, tag, DOCKER_HOST
 
-[testenv:ansible-2.12]
-basepython = python3.8
-deps =
-    -rrequirements.txt
-    ansible-core==2.12.*
-    ansible-lint==5.*
-
-[testenv:ansible-2.13]
-basepython = python3.8
-deps =
-    -rrequirements.txt
-    ansible-core==2.13.*
-    ansible-lint==5.*
-
-[testenv:ansible-2.14]
-basepython = python3.9
-deps =
-    -rrequirements.txt
-    ansible-core==2.14.*
-    ansible-lint==6.*
+# Test supported releases of ansible-core. See:
+# https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix
 
 [testenv:ansible-2.15]
 basepython = python3.9
@@ -54,3 +36,13 @@ deps =
     -rrequirements.txt
     ansible-core==2.17.*
     ansible-lint==24.*
+
+# Future work, not releases, just prepared. See:
+# https://docs.ansible.com/ansible/devel//roadmap/ROADMAP_2_18.html
+# Note: enable python3.13 in `vars/main.yml` as well.
+# [testenv:ansible-2.18]
+# basepython = python3.13
+# deps =
+#     -rrequirements.txt
+#     ansible-core==2.18.*
+#     ansible-lint==24.*