Merge pull request #125 from GomathiselviS/remove_2_9

Remove stable-2.9 and stable-2.13 support and add stable-2.16 support.
ansible-network · Nov 9, 2023 · fba255c · fba255c
2 parents c08be35 + d1b86c8
commit fba255c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 83 deletions.
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
@@ -8,72 +8,30 @@ on:
         default: ""
       matrix_exclude:
         # https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix
-        # 2.9 supports Python 3.5-3.8
-        # 2.13 supports Python 3.8-3.10
         # 2.14 supports Python 3.9-3.11
         # 2.15 supports Python 3.9-3.11
-        # 2.16 supports Python 3.10-3.11
-        # https://docs.ansible.com/ansible/devel/roadmap/ROADMAP_2_16.html
-        # milestone is 2.16 until after 2.16 branches from devel
-        # devel is 2.16 until 2023-09-18
+        # 2.16 supports Python 3.10-3.12
+        # https://docs.ansible.com/ansible/devel/roadmap/ROADMAP_2_17.html
+        # milestone is 2.17 until after 2.17 branches from devel
+        # devel is 2.17 until 2024-04-01
         default: >-
           [
-            {
-              "ansible-version": "stable-2.9",
-              "python-version": "3.9"
-            },
-            {
-              "ansible-version": "stable-2.9",
-              "python-version": "3.10"
-            },
-            {
-              "ansible-version": "stable-2.9",
-              "python-version": "3.11"
-            },
-            {
-              "ansible-version": "stable-2.13",
-              "python-version": "3.7"
-            },
-            {
-              "ansible-version": "stable-2.13",
-              "python-version": "3.11"
-            },
-            {
-              "ansible-version": "stable-2.14",
-              "python-version": "3.7"
-            },
             {
               "ansible-version": "stable-2.14",
-              "python-version": "3.8"
-            },
-            {
-              "ansible-version": "stable-2.15",
-              "python-version": "3.7"
+              "python-version": "3.12"
             },
             {
               "ansible-version": "stable-2.15",
-              "python-version": "3.8"
+              "python-version": "3.12"
             },
             {
-              "ansible-version": "milestone",
-              "python-version": "3.7"
-            },
-            {
-              "ansible-version": "milestone",
-              "python-version": "3.8"
+              "ansible-version": "stable-2.16",
+              "python-version": "3.9"
             },
             {
               "ansible-version": "milestone",
               "python-version": "3.9"
             },
-            {
-              "ansible-version": "devel",
-              "python-version": "3.7"
-            },
-            {
-              "ansible-version": "devel",
-              "python-version": "3.8"
-            },
             {
               "ansible-version": "devel",
               "python-version": "3.9"
@@ -82,16 +40,7 @@ on:
         required: false
         type: string
       matrix_include:
-        # python 3.6 is not available after ubuntu-20.04
-        # python 3.6 is not supported on ansible 2.12+
-        default: >-
-          [
-            {
-              "os": "ubuntu-20.04",
-              "ansible-version": "stable-2.9",
-              "python-version": "3.6"
-            },
-          ]
+        default: []
         required: false
         type: string
       unstable:
@@ -113,18 +62,16 @@ jobs:
         os:
           - ubuntu-latest
         ansible-version:
-          - stable-2.9
-          - stable-2.13
           - stable-2.14
           - stable-2.15
+          - stable-2.16
           - milestone
           - devel
         python-version:
-          - "3.7"
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         exclude: ${{ fromJSON(inputs.matrix_exclude) }}
         include: ${{ fromJSON(inputs.matrix_include) }}
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/unit_source.yml b/.github/workflows/unit_source.yml
@@ -8,39 +8,30 @@ on:
         default: ""
       matrix_exclude:
         # https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix
-        # 2.13 supports Python 3.8-3.10
         # 2.14 supports Python 3.9-3.11
         # 2.15 supports Python 3.9-3.11
-        # 2.16 supports Python 3.10-3.11
-        # https://docs.ansible.com/ansible/devel/roadmap/ROADMAP_2_16.html
-        # milestone is 2.16 until after 2.16 branches from devel
-        # devel is 2.16 until 2023-09-18
+        # 2.16 supports Python 3.10-3.12
+        # https://docs.ansible.com/ansible/devel/roadmap/ROADMAP_2_17.html
+        # milestone is 2.17 until after 2.17 branches from devel
+        # devel is 2.17 until 2024-04-01
         default: >-
           [
-            {
-              "ansible-version": "stable-2.13",
-              "python-version": "3.11"
-            },
             {
               "ansible-version": "stable-2.14",
-              "python-version": "3.8"
+              "python-version": "3.12"
             },
             {
               "ansible-version": "stable-2.15",
-              "python-version": "3.8"
+              "python-version": "3.12"
             },
             {
-              "ansible-version": "milestone",
-              "python-version": "3.8"
+              "ansible-version": "stable-2.16",
+              "python-version": "3.9"
             },
             {
               "ansible-version": "milestone",
               "python-version": "3.9"
             },
-            {
-              "ansible-version": "devel",
-              "python-version": "3.8"
-            },
             {
               "ansible-version": "devel",
               "python-version": "3.9"
@@ -60,16 +51,16 @@ jobs:
       matrix:
         ansible-version:
           # ansible 2.9 does install from git
-          - stable-2.13
           - stable-2.14
           - stable-2.15
+          - stable-2.16
           - milestone
           - devel
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         exclude: ${{ fromJSON(inputs.matrix_exclude) }}
     continue-on-error: ${{ matrix.ansible-version == 'devel' }}