Merge pull request #370 from cloudfoundry/fix-github-org-automation

Separate workflow for peribolos dump
cloudfoundry · Jul 26, 2022 · ed9355d · ed9355d
2 parents bdaa5b9 + 7760d56
commit ed9355d
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 75 deletions.
diff --git a/.github/workflows/org-management-peribolos-dump.yml b/.github/workflows/org-management-peribolos-dump.yml
@@ -0,0 +1,57 @@
+name: 'Dump Github Organization Settings'
+on:
+  workflow_dispatch
+
+jobs:  
+  generate-peribolos-dump:
+    runs-on: ubuntu-18.04
+    concurrency:
+      group: peribolos
+    services:
+      ghproxy:
+        image: rkoster/ghproxy
+        options: >-
+          --mount type=bind,source=/etc/passwd,target=/etc/passwd,readonly
+          --mount type=bind,source=/etc/group,target=/etc/group,readonly
+        ports:
+          - 8888:8888
+        volumes:
+          - ${{ github.workspace }}/ghproxy-cache:/cache
+    steps:
+      - name: ghproxy-cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ github.workspace }}/ghproxy-cache
+          key: ghproxy-cache-${{ github.run_number }}
+          restore-keys: |
+            ghproxy-cache-
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # full clone so a PR can be created if needed
+          path: community
+      - name: write github private key
+        run: |
+          echo "${GH_PRIVATE_KEY}" > private_key
+          echo "${GH_TOKEN}" > token
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_PRIVATE_KEY: ${{ secrets.GH_PRIVATE_KEY }}
+      - name: generate-peribolos-dump
+        uses: docker://gcr.io/k8s-prow/peribolos
+        with:
+          entrypoint: /bin/sh
+          # Switch back to app auth once following PR gets merged: https://github.com/kubernetes/test-infra/pull/24882
+          # args: --dump-full --dump cloudfoundry --github-app-id=${{ secrets.GH_APP_ID }} --github-app-private-key-path=private_key > org/cloudfoundry.yml
+          args: -c "/ko-app/peribolos --dump-full --dump cloudfoundry --github-endpoint http://ghproxy:8888 --github-token-path=token > community/org/cloudfoundry.yml"
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          path: community
+          add-paths: org/cloudfoundry.yml
+          commit-message: Run peribolos -dump-full
+          branch: peribolos-dump
+          draft: true
+          title: 'Sync org/cloudfoundry.yml with reality'
+          body: |
+            This PR contains a fresh peribolos dump.
+            PR is intended for debugging. Don't merge as-is because parts of the cloudfoundry org configuration are generated from WG charters.
diff --git a/.github/workflows/org-management.yml b/.github/workflows/org-management.yml
@@ -16,8 +16,6 @@ jobs:
     runs-on: ubuntu-18.04
     concurrency:
       group: peribolos
-    outputs:
-      peribolos-outcome: ${{ steps.peribolos.outcome }}
     services:
       ghproxy:
         image: rkoster/ghproxy
@@ -40,9 +38,8 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: 3.9
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
-          fetch-depth: 0 # full clone so a PR can be created if needed
           path: community
       - name: Generate github org configuration
         run: |
@@ -57,7 +54,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           GH_PRIVATE_KEY: ${{ secrets.GH_PRIVATE_KEY }}
       - name: peribolos
-        continue-on-error: true
         id: peribolos
         uses: docker://gcr.io/k8s-prow/peribolos
         with:
@@ -77,73 +73,4 @@ jobs:
             --fix-teams
             --fix-team-members
             --fix-team-repos
-            --allow-repo-archival
-      - name: debug
-        run: |
-          echo "steps.peribolos.outcome = ${{ steps.peribolos.outcome }}"
-      - name: Fail on peribolos error
-        if: ${{ steps.peribolos.outcome == 'failure' }}
-        run: |
-          echo "sync job failed, trigger creation of dump PR"
-          exit 1
-  
-  generate-peribolos-dump:
-    needs: peribolos
-    if: ${{ failure() && needs.peribolos.outputs.peribolos-outcome == 'failure' }} # only run on peribolos failures not on WG yaml validation errors
-    runs-on: ubuntu-18.04
-    concurrency:
-      group: peribolos
-    services:
-      ghproxy:
-        image: rkoster/ghproxy
-        options: >-
-          --mount type=bind,source=/etc/passwd,target=/etc/passwd,readonly
-          --mount type=bind,source=/etc/group,target=/etc/group,readonly
-        ports:
-          - 8888:8888
-        volumes:
-          - ${{ github.workspace }}/ghproxy-cache:/cache
-    steps:
-      - name: ghproxy-cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/ghproxy-cache
-          key: ghproxy-cache-${{ github.run_number }}
-          restore-keys: |
-            ghproxy-cache-
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0 # full clone so a PR can be created if needed
-          path: community
-      - name: write github private key
-        run: |
-          echo "${GH_PRIVATE_KEY}" > private_key
-          echo "${GH_TOKEN}" > token
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          GH_PRIVATE_KEY: ${{ secrets.GH_PRIVATE_KEY }}
-      - name: generate-peribolos-dump
-        uses: docker://gcr.io/k8s-prow/peribolos
-        with:
-          entrypoint: /bin/sh
-          # Switch back to app auth once following PR gets merged: https://github.com/kubernetes/test-infra/pull/24882
-          # args: --dump-full --dump cloudfoundry --github-app-id=${{ secrets.GH_APP_ID }} --github-app-private-key-path=private_key > org/cloudfoundry.yml
-          args: -c "/ko-app/peribolos --dump-full --dump cloudfoundry --github-endpoint http://ghproxy:8888 --github-token-path=token > community/org/cloudfoundry.yml"
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
-        with:
-          path: community
-          add-paths: org/cloudfoundry.yml
-          commit-message: Run peribolos -dump-full
-          branch: peribolos-dump
-          draft: true
-          title: 'Sync org/cloudfoundry.yml with reality'
-          body: |
-            Peribolos failed to sync here: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
-
-            This PR contains a fresh periobos dump which once merged should resolve the sync issues.
-            PR is intended for debugging. Don't merge as-is because parts of the cloudfoundry org configuration are generated from WG charters.
-      - name: Fail job on sync failure
-        run: |
-          echo "sync job failed, dump PR created"
-          exit 1
+            --allow-repo-archival