zoey/config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

update auth strategy

Browse source
This commit is contained in:
zack 2024-10-19 21:21:51 -04:00
parent 78322e67b0
commit 52e1577a8c
No known key found for this signature in database
GPG key ID: 5F873416BCF59F35
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
.github/workflows/update.yml vendored
View file

@ -68,10 +68,11 @@ jobs:
base: main base: main
- name: Create Hydra jobset - name: Create Hydra jobset
if: steps.git-check.outputs.CHANGED == 'true' if: steps.git-check.outputs.CHANGED == 'true' && steps.create-pr.outputs.pull-request-number
run: | run: |
AUTH_HEADER="Authorization: Basic $(echo -n '${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}' | base64)"
curl -X PUT -H "Content-Type: application/json" \ curl -X PUT -H "Content-Type: application/json" \
-u "${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}" \ -H "$AUTH_HEADER" \
-d '{ -d '{
"enabled": 1, "enabled": 1,
"visible": true, "visible": true,
@ -85,21 +86,24 @@ jobs:
"${{ env.HYDRA_INSTANCE }}/jobset/${{ env.HYDRA_PROJECT }}/${{ env.HYDRA_JOBSET }}" "${{ env.HYDRA_INSTANCE }}/jobset/${{ env.HYDRA_PROJECT }}/${{ env.HYDRA_JOBSET }}"
- name: Trigger Hydra build - name: Trigger Hydra build
if: steps.git-check.outputs.CHANGED == 'true' if: steps.git-check.outputs.CHANGED == 'true' && steps.create-pr.outputs.pull-request-number
run: | run: |
AUTH_HEADER="Authorization: Basic $(echo -n '${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}' | base64)"
curl -X POST -H "Content-Type: application/json" \ curl -X POST -H "Content-Type: application/json" \
-u "${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}" \ -H "$AUTH_HEADER" \
-H "Origin: ${{ env.HYDRA_INSTANCE }}" \
-d '{"jobsets": ["${{ env.HYDRA_PROJECT }}:${{ env.HYDRA_JOBSET }}"]}' \ -d '{"jobsets": ["${{ env.HYDRA_PROJECT }}:${{ env.HYDRA_JOBSET }}"]}' \
"${{ env.HYDRA_INSTANCE }}/api/push" "${{ env.HYDRA_INSTANCE }}/api/push"
- name: Wait for Hydra build - name: Wait for Hydra build
if: steps.git-check.outputs.CHANGED == 'true' if: steps.git-check.outputs.CHANGED == 'true' && steps.create-pr.outputs.pull-request-number
id: wait-for-build id: wait-for-build
run: | run: |
AUTH_HEADER="Authorization: Basic $(echo -n '${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}' | base64)"
max_attempts=60 # 30 minutes (30 * 2 minutes) max_attempts=60 # 30 minutes (30 * 2 minutes)
attempt=0 attempt=0
while [ $attempt -lt $max_attempts ]; do while [ $attempt -lt $max_attempts ]; do
response=$(curl -s -u "${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}" \ response=$(curl -s -H "$AUTH_HEADER" \
"${{ env.HYDRA_INSTANCE }}/api/jobsets?project=${{ env.HYDRA_PROJECT }}") "${{ env.HYDRA_INSTANCE }}/api/jobsets?project=${{ env.HYDRA_PROJECT }}")
status=$(echo "$response" | jq -r '.[] | select(.name == "${{ env.HYDRA_JOBSET }}") | .nrfailed') status=$(echo "$response" | jq -r '.[] | select(.name == "${{ env.HYDRA_JOBSET }}") | .nrfailed')
if [ "$status" = "0" ]; then if [ "$status" = "0" ]; then
@ -115,14 +119,14 @@ jobs:
echo "BUILD_SUCCESS=false" >> $GITHUB_OUTPUT # Timeout, consider as failure echo "BUILD_SUCCESS=false" >> $GITHUB_OUTPUT # Timeout, consider as failure
- name: Merge PR if build succeeds - name: Merge PR if build succeeds
if: steps.git-check.outputs.CHANGED == 'true' && steps.wait-for-build.outputs.BUILD_SUCCESS == 'true' if: steps.git-check.outputs.CHANGED == 'true' && steps.wait-for-build.outputs.BUILD_SUCCESS == 'true' && steps.create-pr.outputs.pull-request-number
run: | run: |
gh pr merge ${{ steps.create-pr.outputs.pull-request-number }} --merge gh pr merge ${{ steps.create-pr.outputs.pull-request-number }} --merge
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Schedule retry if build fails - name: Schedule retry if build fails
if: steps.git-check.outputs.CHANGED == 'true' && steps.wait-for-build.outputs.BUILD_SUCCESS != 'true' if: steps.git-check.outputs.CHANGED == 'true' && steps.wait-for-build.outputs.BUILD_SUCCESS != 'true' && steps.create-pr.outputs.pull-request-number
uses: peter-evans/create-or-update-comment@v3 uses: peter-evans/create-or-update-comment@v3
with: with:
issue-number: ${{ steps.create-pr.outputs.pull-request-number }} issue-number: ${{ steps.create-pr.outputs.pull-request-number }}
@ -130,7 +134,7 @@ jobs:
The Hydra build failed. This PR will be updated and retried in 24 hours. The Hydra build failed. This PR will be updated and retried in 24 hours.
- name: Retry update after 24 hours - name: Retry update after 24 hours
if: steps.git-check.outputs.CHANGED == 'true' && steps.wait-for-build.outputs.BUILD_SUCCESS != 'true' if: steps.git-check.outputs.CHANGED == 'true' && steps.wait-for-build.outputs.BUILD_SUCCESS != 'true' && steps.create-pr.outputs.pull-request-number
uses: peter-evans/repository-dispatch@v2 uses: peter-evans/repository-dispatch@v2
with: with:
event-type: retry-flake-update event-type: retry-flake-update
@ -169,18 +173,21 @@ jobs:
- name: Trigger Hydra build - name: Trigger Hydra build
run: | run: |
AUTH_HEADER="Authorization: Basic $(echo -n '${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}' | base64)"
curl -X POST -H "Content-Type: application/json" \ curl -X POST -H "Content-Type: application/json" \
-u "${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}" \ -H "$AUTH_HEADER" \
-H "Origin: ${{ env.HYDRA_INSTANCE }}" \
-d '{"jobsets": ["${{ env.HYDRA_PROJECT }}:${{ env.HYDRA_JOBSET }}"]}' \ -d '{"jobsets": ["${{ env.HYDRA_PROJECT }}:${{ env.HYDRA_JOBSET }}"]}' \
"${{ env.HYDRA_INSTANCE }}/api/push" "${{ env.HYDRA_INSTANCE }}/api/push"
- name: Wait for Hydra build - name: Wait for Hydra build
id: wait-for-build id: wait-for-build
run: | run: |
AUTH_HEADER="Authorization: Basic $(echo -n '${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}' | base64)"
max_attempts=60 # 30 minutes (30 * 2 minutes) max_attempts=60 # 30 minutes (30 * 2 minutes)
attempt=0 attempt=0
while [ $attempt -lt $max_attempts ]; do while [ $attempt -lt $max_attempts ]; do
response=$(curl -s -u "${{ secrets.HYDRA_USERNAME }}:${{ secrets.HYDRA_PASSWORD }}" \ response=$(curl -s -H "$AUTH_HEADER" \
"${{ env.HYDRA_INSTANCE }}/api/jobsets?project=${{ env.HYDRA_PROJECT }}") "${{ env.HYDRA_INSTANCE }}/api/jobsets?project=${{ env.HYDRA_PROJECT }}")
status=$(echo "$response" | jq -r '.[] | select(.name == "${{ env.HYDRA_JOBSET }}") | .nrfailed') status=$(echo "$response" | jq -r '.[] | select(.name == "${{ env.HYDRA_JOBSET }}") | .nrfailed')
if [ "$status" = "0" ]; then if [ "$status" = "0" ]; then