diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a8d23875143..f58e60f0446 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,11 +34,7 @@ permissions: jobs: packages: name: "Build Flatcar packages" - runs-on: - - self-hosted - - ubuntu - - build - - amd64 + runs-on: oracle-vm-32cpu-128gb-x86-64 strategy: fail-fast: false matrix: diff --git a/.github/workflows/run-kola-tests.yaml b/.github/workflows/run-kola-tests.yaml index 22002dbde14..6c39aa524e2 100644 --- a/.github/workflows/run-kola-tests.yaml +++ b/.github/workflows/run-kola-tests.yaml @@ -17,15 +17,11 @@ on: jobs: tests: name: "Run Kola tests" - runs-on: - - self-hosted - - ubuntu - - kola - - ${{ matrix.arch }} + runs-on: oracle-vm-32cpu-128gb-x86-64 strategy: fail-fast: false matrix: - arch: ["amd64", "arm64"] + arch: ["amd64"] steps: - name: Prepare machine @@ -34,9 +30,7 @@ jobs: run: | sudo rm /bin/sh sudo ln -s /bin/bash /bin/sh - sudo apt-get install -y ca-certificates curl gnupg lsb-release qemu-system git bzip2 jq dnsmasq python3 zstd - sudo systemctl stop dnsmasq - sudo systemctl mask dnsmasq + sudo apt update && sudo apt install -y ca-certificates curl gnupg lsb-release qemu-system git bzip2 jq dnsmasq python3 zstd iproute2 iptables # Set up MASQUERADE. Don't care much to secure it. # This is needed for the VMs kola spins up to have internet access. @@ -143,7 +137,8 @@ jobs: # For the sake of that test we will serve both via a temporary local web server. TESTS_WEBSERVER_WEBROOT="scripts/devcontainer-webroot" default_rout_device="$(sudo ip -j route sh default |jq -r .[0].dev)" - TESTS_WEBSERVER_IP="$(sudo ip -j address show dev "${default_rout_device}" | jq -r .[0].addr_info[0].local)" + # TESTS_WEBSERVER_IP="$(sudo ip -j address show dev "${default_rout_device}" | jq -r .[0].addr_info[0].local)" + TESTS_WEBSERVER_IP="10.0.2.2" TESTS_WEBSERVER_PORT=12345 echo "TESTS_WEBSERVER_WEBROOT=${TESTS_WEBSERVER_WEBROOT}" >> "$GITHUB_ENV" echo "TESTS_WEBSERVER_IP=${TESTS_WEBSERVER_IP}" >> "$GITHUB_ENV" @@ -167,7 +162,7 @@ jobs: set -x set -euo pipefail - python3 -m http.server -d "${TESTS_WEBSERVER_WEBROOT}" -b "${TESTS_WEBSERVER_IP}" "${TESTS_WEBSERVER_PORT}" & + python3 -m http.server -d "${TESTS_WEBSERVER_WEBROOT}" "${TESTS_WEBSERVER_PORT}" & pushd scripts @@ -186,7 +181,7 @@ jobs: source ci-automation/test.sh - PARALLEL_ARCH=10 + PARALLEL_ARCH=5 cat > sdk_container/.env <