Skip to content

Commit

Permalink
Merge pull request #148 from mihaelabalutoiu/fix-handle-error
Browse files Browse the repository at this point in the history
Set pipefail to the script and log org/repo details on timeout exceeded
  • Loading branch information
gabriel-samfira committed Aug 7, 2023
2 parents 29660c0 + 191d44f commit 1a07073
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ jobs:
run: sudo mkdir -p /artifacts-logs && sudo chmod 777 /artifacts-logs

- name: Run integration tests
run: go run ./test/integration/e2e.go 2>&1 | tee /artifacts-logs/e2e.log
run: |
set -o pipefail
set -o errexit
go run ./test/integration/e2e.go 2>&1 | tee /artifacts-logs/e2e.log
env:
GARM_BASE_URL: ${{ steps.ngrok.outputs.tunnel-url }}
GARM_USERNAME: admin
Expand Down
8 changes: 8 additions & 0 deletions test/integration/e2e.go
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,10 @@ func WaitRepoInstance(timeout time.Duration) {
time.Sleep(5 * time.Second)
timeWaited += 5
}
repo, err := getRepo(cli, authToken, repoID)
handleError(err)
printResponse(repo)

instanceDetails, err := getInstance(cli, authToken, instance.Name)
handleError(err)
printResponse(instanceDetails)
Expand Down Expand Up @@ -823,6 +827,10 @@ func WaitOrgInstance(timeout time.Duration) {
time.Sleep(5 * time.Second)
timeWaited += 5
}
org, err := getOrg(cli, authToken, orgID)
handleError(err)
printResponse(org)

instanceDetails, err := getInstance(cli, authToken, instance.Name)
handleError(err)
printResponse(instanceDetails)
Expand Down

0 comments on commit 1a07073

Please sign in to comment.