diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3f9ac212..acc28800 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -6,7 +6,7 @@ on: jobs: integration-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-noble-garm steps: - name: Checkout uses: actions/checkout@v4 @@ -17,14 +17,14 @@ jobs: go-version-file: go.mod - name: Setup LXD - uses: canonical/setup-lxd@v0.1.1 + uses: canonical/setup-lxd@main - name: Install dependencies run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list - sudo apt-get -qq update && sudo apt-get -qq install -y apg coreutils make + sudo apt-get -qq update && sudo apt-get -qq install -y apg coreutils make jq build-essential libsqlite3-dev libsqlite3-0 - - name: Set up localshow tunnel + - name: Set up tunnel shell: bash run: | mkdir -p /home/runner/.ssh diff --git a/test/integration/config/config.toml b/test/integration/config/config.toml index 3d5fbc13..62c2d9d7 100644 --- a/test/integration/config/config.toml +++ b/test/integration/config/config.toml @@ -37,14 +37,4 @@ description = "external test provider" provider_type = "external" [provider.external] config_file = "${GARM_CONFIG_DIR}/test-provider/config" - provider_executable = "${GARM_CONFIG_DIR}/test-provider/garm-external-provider" - -[[github]] -name = "${CREDENTIALS_NAME}" -description = "GARM GitHub OAuth token" -oauth2_token = "${GH_TOKEN}" - -[[github]] -name = "${CREDENTIALS_NAME}-clone" -description = "GARM GitHub OAuth token - clone" -oauth2_token = "${GH_TOKEN}" + provider_executable = "${GARM_CONFIG_DIR}/test-provider/garm-external-provider" \ No newline at end of file diff --git a/test/integration/scripts/setup-garm.sh b/test/integration/scripts/setup-garm.sh index e574b542..87a83922 100755 --- a/test/integration/scripts/setup-garm.sh +++ b/test/integration/scripts/setup-garm.sh @@ -71,7 +71,7 @@ sudo cp $CONFIG_DIR/garm-provider-lxd.toml $LXD_PROVIDER_CONFIG function clone_and_build_lxd_provider() { git clone https://github.com/cloudbase/garm-provider-lxd ~/garm-provider-lxd pushd ~/garm-provider-lxd - go build -o $LXD_PROVIDER_EXECUTABLE + CGO_ENABLED=1 go build -o $LXD_PROVIDER_EXECUTABLE popd }