Merge branch 'main' into patch-1

vexxhost · Oct 12, 2023 · 60a1815 · 60a1815
2 parents 89d9a60 + 11645e4
commit 60a1815
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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-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: ubuntu-latest-16-cores
+    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

diff --git 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