update support matrix

bodsch · Oct 24, 2021 · a91ad52 · a91ad52
1 parent a82e7cf
commit a91ad52
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
           # VALIDATE_MARKDOWN: true
           VALIDATE_YAML: true
 
-  test:
+  arch_standard:
     name: "${{ matrix.image }} / python: ${{ matrix.python-version }}, ansible: ${{ matrix.ansible-version }}"
     needs:
       - lint
@@ -43,11 +43,96 @@ jobs:
       matrix:
         image:
           - archlinux:latest
+        python-version:
+          - '3.8'
+          - '3.9'
+        ansible-version:
+          - '2.9'
+          - '2.10'
+
+    steps:
+      - name: check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'ansible-users'
+
+      - name: set up python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r test-requirements.txt
+
+      - name: test default
+        run: |
+          tox -e py$(printf "${{ matrix.python-version }}" | tr -d '.')-ansible$(printf "${{ matrix.ansible-version }}" | tr -d '.') -- \
+            molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          DISTRIBUTION: ${{ matrix.image }}
+
+  deb_standard:
+    name: "${{ matrix.image }} / python: ${{ matrix.python-version }}, ansible: ${{ matrix.ansible-version }}"
+    needs:
+      - lint
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
           - debian:9
           - debian:10
+          - debian:11
           - ubuntu:18.04
           - ubuntu:20.04
+        python-version:
+          - '3.8'
+          - '3.9'
+        ansible-version:
+          - '2.9'
+          - '2.10'
+
+    steps:
+      - name: check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'ansible-users'
+
+      - name: set up python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r test-requirements.txt
+
+      - name: test default
+        run: |
+          tox -e py$(printf "${{ matrix.python-version }}" | tr -d '.')-ansible$(printf "${{ matrix.ansible-version }}" | tr -d '.') -- \
+            molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          DISTRIBUTION: ${{ matrix.image }}
+
+  rpm_standard:
+    name: "${{ matrix.image }} / python: ${{ matrix.python-version }}, ansible: ${{ matrix.ansible-version }}"
+    needs:
+      - lint
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - centos:7
           - centos:8
+          - oraclelinux:7
           - oraclelinux:8
         python-version:
           - '3.8'
@@ -72,14 +157,16 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r test-requirements.txt
 
-      - name: test with tox
+      - name: test default
         run: |
-          tox -e py$(printf "${{ matrix.python-version }}" | tr -d '.')-ansible$(printf "${{ matrix.ansible-version }}" | tr -d '.') -- molecule test
+          tox -e py$(printf "${{ matrix.python-version }}" | tr -d '.')-ansible$(printf "${{ matrix.ansible-version }}" | tr -d '.') -- \
+            molecule test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
           DISTRIBUTION: ${{ matrix.image }}
 
+
   # publish:
   #   if: github.ref == 'refs/heads/master'
   #   needs:

diff --git a/README.md b/README.md
@@ -17,10 +17,10 @@ Add users, change passwords, lock/unlock user accounts, manage sudo access (per
 
 Tested on
 
+* Debian 9 / 10 / 11
 * Ubuntu 18.04 / 20.04
-* Debian 9 / 10
-* CentOS 8
-* OracleLinux 8
+* CentOS 7 / 8
+* OracleLinux 7 / 8
 * ArchLinux
 
 

diff --git a/meta/main.yml b/meta/main.yml
@@ -11,8 +11,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        # 16.04
-        - cosmic
         # 18.04
         - bionic
         # 20.04
@@ -23,6 +21,8 @@ galaxy_info:
         - etch
         # 10
         - buster
+        # 11
+        - bullseye
     - name: EL
       versions:
         - 7