Skip to content

Commit

Permalink
Minor CI fixes (#6000)
Browse files Browse the repository at this point in the history
## Summary of changes

- Try to make the code-freeze PR not block
- Try to prevent timeouts in gitlab jobs

## Reason for change

The auto-pass code freeze check [doesn't seem to be working for
PRs](#5986) to non-master
for some reason.

Also the gitlab job that waits for artifacts to be ready before trying
to download frequently times out.

## Implementation details

Try to force the auto-check to work. It should _already_ be working
AFAICT based on the docs, so this is a stab in the dark 🤞

For the gitlab job, wait for longer
  • Loading branch information
andrewlock authored Sep 6, 2024
1 parent c35416b commit 8a81a8b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/auto_code_freeze_block_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ name: Auto Block PR on Code Freeze

on:
pull_request:
branches:
- 'main'
- 'master'
- 'release/**'
- 'hotfix/**'


jobs:
check_for_code_freeze:
Expand Down
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ publish:
download-single-step-artifacts:
stage: package
image: registry.ddbuild.io/docker:20.10.13-gbi-focal
timeout: 45m
tags: [ "arch:amd64" ]
needs: []
rules:
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/download-single-step-artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ echo "Found build with id '$buildId' for commit '$CI_COMMIT_SHA' on branch '$bra
# Now try to download the ssi artifacts from the build
artifactsUrl="https://dev.azure.com/datadoghq/dd-trace-dotnet/_apis/build/builds/$buildId/artifacts?api-version=7.1&artifactName=$artifactName"

# Keep trying to get the artifact for 30 minutes
TIMEOUT=1800
# Keep trying to get the artifact for 40 minutes
TIMEOUT=2400
STARTED=0
until (( STARTED == TIMEOUT )) || [ ! -z "${downloadUrl}" ] ; do
echo "Checking for artifacts at '$artifactsUrl'..."
Expand Down

0 comments on commit 8a81a8b

Please sign in to comment.