Merge branch 'main' into fix_lint

redhat-cop · Nov 30, 2023 · 1336a21 · 1336a21
2 parents ee21a29 + 4ab2296
commit 1336a21
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 74 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,27 +1,14 @@
 ---
 name: Release
 
-on:   # yamllint disable-line rule:truthy
+on:  # yamllint disable-line rule:truthy
   release:
     types: [published]
 
 jobs:
-  release_ah:
-    runs-on: ubuntu-latest
-    environment: ah
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: "Publish collection on ah"
-        run: |
-          ansible-galaxy collection build -v --force
-          TARBALL=$(ls -1 ./*.tar.gz)
-          cat << EOF > ansible.cfg
-          [galaxy]
-          server_list = rh_automation_hub
-          [galaxy_server.rh_automation_hub]
-          url=https://cloud.redhat.com/api/automation-hub/
-          auth_url=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-          token=${{ secrets.AH_TOKEN }}
-          EOF
-          ansible-galaxy collection publish "${TARBALL}"
+  release_automation_hub:
+    uses: ansible/devtools/.github/workflows/release_ah.yml@main
+    with:
+      environment: ah
+    secrets:
+      ah_token: ${{ secrets.AH_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,58 +21,74 @@ jobs:
     with:
       matrix_include: "[]"
       matrix_exclude: >-
-        [
-          {
-            "ansible-version": "stable-2.9"
-          },
-          {
-            "ansible-version": "stable-2.12",
-          },
-          {
-            "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"
-          },
-          {
-            "ansible-version": "stable-2.15",
-            "python-version": "3.8"
-          },
-          {
-            "ansible-version": "milestone",
-            "python-version": "3.7"
-          },
-          {
-            "ansible-version": "milestone",
-            "python-version": "3.8"
-          },
-          {
-            "ansible-version": "devel",
-            "python-version": "3.7"
-          },
-          {
-            "ansible-version": "devel",
-            "python-version": "3.8"
-          },
-          {
-            "ansible-version": "devel",
-            "python-version": "3.9"
-          }
-        ]
+          [
+            {
+              "ansible-version": "stable-2.9"
+            },
+            {
+              "ansible-version": "stable-2.12",
+            },
+            {
+              "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.14",
+              "python-version": "3.12"
+            },
+            {
+              "ansible-version": "stable-2.15",
+              "python-version": "3.7"
+            },
+            {
+              "ansible-version": "stable-2.15",
+              "python-version": "3.8"
+            },
+            {
+              "ansible-version": "stable-2.15",
+              "python-version": "3.12"
+            },
+            {
+              "ansible-version": "stable-2.16",
+              "python-version": "3.9"
+            },
+            {
+              "ansible-version": "milestone",
+              "python-version": "3.7"
+            },
+            {
+              "ansible-version": "milestone",
+              "python-version": "3.8"
+            },
+            {
+              "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"
+            },
+          ]
   all_green:
     if: ${{ always() && (github.event_name != 'schedule') }}
     needs:
@@ -81,7 +97,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: >-
-          python -c "assert set([
+          steps:
+      - run: >-
+          python -c "assert 'failure' not in
+          set([
           '${{ needs.changelog.result }}',
           '${{ needs.sanity.result }}',
-          ]) == {'success'}"
+          ])"