Skip to content

Commit

Permalink
simplify integration test job
Browse files Browse the repository at this point in the history
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
  • Loading branch information
gabriel-samfira committed Feb 26, 2024
1 parent c233559 commit 111b93f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ jobs:
port: 9997
tunnel_type: http

- name: Setup GARM
run: ./test/integration/scripts/setup-garm.sh
env:
GH_OAUTH_TOKEN: ${{ secrets.GH_OAUTH_TOKEN }}
CREDENTIALS_NAME: test-garm-creds
GARM_BASE_URL: ${{ steps.ngrok.outputs.tunnel-url }}

- name: Generate secrets
run: |
GARM_PASSWORD=$(apg -n1 -m32)
Expand All @@ -62,7 +55,7 @@ jobs:
run: |
set -o pipefail
set -o errexit
go run ./test/integration/main.go 2>&1 | tee /artifacts-logs/e2e.log
make integration 2>&1 | tee /artifacts-logs/e2e.log
env:
GARM_BASE_URL: ${{ steps.ngrok.outputs.tunnel-url }}
ORG_NAME: gsamfira
Expand All @@ -74,8 +67,8 @@ jobs:
- name: Show GARM logs
if: always()
run: |
sudo systemctl status garm
sudo journalctl -u garm --no-pager 2>&1 | tee /artifacts-logs/garm.log
sudo systemctl status garm@runner || true
sudo journalctl --no-pager 2>&1 | tee /artifacts-logs/system.log
- name: Upload GARM and e2e logs
if: always()
Expand Down
2 changes: 1 addition & 1 deletion test/integration/config/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ provider_type = "external"
[[github]]
name = "${CREDENTIALS_NAME}"
description = "GARM GitHub OAuth token"
oauth2_token = "${GH_OAUTH_TOKEN}"
oauth2_token = "${GH_TOKEN}"

[[github]]
name = "${CREDENTIALS_NAME}-clone"
Expand Down

0 comments on commit 111b93f

Please sign in to comment.