From 111b93f06231ba8eaa17f79009ab2063ee607175 Mon Sep 17 00:00:00 2001
From: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
Date: Mon, 26 Feb 2024 17:58:04 +0000
Subject: [PATCH] simplify integration test job

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
---
 .github/workflows/integration-tests.yml | 13 +++----------
 test/integration/config/config.toml     |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 14699b44..0e70db70 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -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)
@@ -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
@@ -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()
diff --git a/test/integration/config/config.toml b/test/integration/config/config.toml
index 6ac2c70f..d937e8ac 100644
--- a/test/integration/config/config.toml
+++ b/test/integration/config/config.toml
@@ -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"