From 6b71d36f763f1d75fcb9290bc41035a7739ba419 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sun, 8 Oct 2023 15:34:14 -0400 Subject: [PATCH 1/3] ci: switch to on-prem autoscaling runners --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 70104466..afd5a724 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -141,7 +141,7 @@ jobs: run: make unit-tests build-images: - runs-on: ubuntu-latest-4-cores + runs-on: v3-starter-8 if: contains(github.event.pull_request.body, '/build-new-image') strategy: fail-fast: false @@ -191,7 +191,7 @@ jobs: path: ${{ matrix.os_distro }}-kube-${{ matrix.kube }}.qcow2 functional: - runs-on: ubuntu-latest-16-cores + runs-on: v3-starter-8 strategy: fail-fast: false matrix: From 777bcda1aada1c35e8ea6cde82678b63c0dcefb2 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sun, 8 Oct 2023 18:10:56 -0400 Subject: [PATCH 2/3] ci: only set DNS_NAMESERVER in hosted runners --- hack/run-functional-tests.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hack/run-functional-tests.sh b/hack/run-functional-tests.sh index cdb2b561..d1f9f2d3 100755 --- a/hack/run-functional-tests.sh +++ b/hack/run-functional-tests.sh @@ -29,11 +29,6 @@ DNS_NAMESERVER=${DNS_NAMESERVER:-1.1.1.1} # Determine image name [[ "${OS_DISTRO}" == "ubuntu" ]] && IMAGE_NAME="ubuntu-2204-kube-${KUBE_TAG}" || IMAGE_NAME="flatcar-kube-${KUBE_TAG}"; -# If running inside GitHub Actions, use Azure's "168.63.129.16" for DNS -if [[ -n "${GITHUB_ACTIONS}" ]]; then - DNS_NAMESERVER=168.63.129.16 -fi - # If `BUILD_NEW_IMAGE` is true, then we use the provided artifact, otherwise # we download the latest promoted image. if [[ "${BUILD_NEW_IMAGE}" != "true" ]]; then From 11645e42af76a30f437c5b472e405c312bf49e4a Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sun, 8 Oct 2023 19:21:35 -0400 Subject: [PATCH 3/3] use equivilant machines --- .github/workflows/test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index afd5a724..53142ecb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -141,7 +141,7 @@ jobs: run: make unit-tests build-images: - runs-on: v3-starter-8 + runs-on: v3-standard-4 if: contains(github.event.pull_request.body, '/build-new-image') strategy: fail-fast: false @@ -191,7 +191,7 @@ jobs: path: ${{ matrix.os_distro }}-kube-${{ matrix.kube }}.qcow2 functional: - runs-on: v3-starter-8 + runs-on: v3-standard-16 strategy: fail-fast: false matrix: @@ -239,6 +239,11 @@ jobs: with: name: ${{ matrix.os_distro }}-kube-${{ matrix.kube }}.qcow2 + - name: Update environment variables for GitHub Hosted Runners + if: contains(runner.name, 'GitHub Actions') + run: | + echo "DNS_NAMESERVER=168.63.129.16" >> $GITHUB_ENV + - name: Run functional tests run: | ./hack/run-functional-tests.sh