update workflows

.github/workflows/pre-commit.yml

@@ -11,25 +11,11 @@ on:
     - cron: "0 6 * * *"
 
 jobs:
-  pre-commit:
-    uses: "redhat-cop/ansible_collections_tooling/.github/workflows/pre-commit.yml@main"
-  sanity:
-    uses: "redhat-cop/ansible_collections_tooling/.github/workflows/sanity.yml@main"
+  pre-commit_and_sanity:
+    uses: "redhat-cop/ansible_collections_tooling/.github/workflows/pre_commit_and_sanity.yml@main"
     with:
       collection_namespace: infra
       collection_name: ee_utilities
-      collection_version: 1.0.0
+      collection_version: 2.0.0
       collection_repo: https://github.com/redhat-cop/ee_utilities/
-  all_green:
-    if: ${{ always() }}
-    needs:
-      - pre-commit
-      - sanity
-    runs-on: ubuntu-latest
-    steps:
-      - run: >-
-          python -c "assert set([
-          '${{ needs.pre-commit.result }}',
-          '${{ needs.sanity.result }}',
-          ]) == {'success'}"
 ...

.github/workflows/release.yml

@@ -9,70 +9,16 @@ on:
       - published
 
 jobs:
-  pre-commit:
-    uses: redhat-cop/ansible_collections_tooling/.github/workflows/pre-commit.yml@main
-  sanity:
-    uses: redhat-cop/ansible_collections_tooling/.github/workflows/sanity.yml@main
-    with:
-      collection_namespace: infra
-      collection_name: ee_utilities
-      collection_version: 1.0.0
-      collection_repo: https://github.com/redhat-cop/ee_utilities/
-  prechecks:
-    needs:
-      - pre-commit
-      - sanity
-    runs-on: ubuntu-latest
-    steps:
-      - run: >-
-          python -c "assert set([
-          '${{ needs.pre-commit.result }}',
-          '${{ needs.sanity.result }}',
-          ]) == {'success'}"
-  cop_release:
-    needs:
-      - prechecks
-    uses: redhat-cop/ansible_collections_tooling/.github/workflows/release.yml@main
-    with:
-      collection_namespace: redhat_cop
-      collection_name: ee_utilities
-      collection_version: ${{ github.ref_name }}
-      collection_repo: https://github.com/redhat-cop/ee_utilities/
-    secrets:
-      api_key: ${{ secrets.ANSIBLE_GALAXY_APIKEY }}
-      token: ${{ secrets.GITHUB_TOKEN }}
-  infra_release:
-    needs:
-      - cop_release
-    uses: redhat-cop/ansible_collections_tooling/.github/workflows/release.yml@main
-    with:
-      collection_namespace: infra
-      collection_name: ee_utilities
-      collection_version: ${{ github.ref_name }}
-      collection_repo: https://github.com/redhat-cop/ee_utilities/
-    secrets:
-      api_key: ${{ secrets.GALAXY_INFRA_KEY }}
-      token: ${{ secrets.GITHUB_TOKEN }}
-  release_check:
-    needs:
-      - cop_release
-      - infra_release
-    runs-on: ubuntu-latest
-    steps:
-      - run: >-
-          python -c "assert set([
-          '${{ needs.infra_release.result }}',
-          '${{ needs.cop_release.result }}',
-          ]) == {'success'}"
-  changelog:
-    needs:
-      - release_check
-    uses: redhat-cop/ansible_collections_tooling/.github/workflows/create_changelog.yml@main
+  release:
+    uses: "redhat-cop/ansible_collections_tooling/.github/workflows/release_pipeline.yml@main"
     with:
       collection_namespace: infra
+      collection_namespace_2: redhat_cop
       collection_name: ee_utilities
       collection_version: ${{ github.ref_name }}
       collection_repo: https://github.com/redhat-cop/ee_utilities/
     secrets:
+      galaxy_api_key: ${{ secrets.ANSIBLE_GALAXY_APIKEY }}
+      infra_api_key: ${{ secrets.GALAXY_INFRA_KEY }}
       token: ${{ secrets.GITHUB_TOKEN }}
 ...