From 2fece1f7d267c554f5a55000080d823fdffb24f2 Mon Sep 17 00:00:00 2001 From: Andrej Copar Date: Mon, 27 Jan 2025 12:07:46 +0000 Subject: [PATCH 1/2] Update runner naming convention in gh-actions workflows --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/e2e.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 21b272b8..d380c899 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ on: jobs: unittest: - runs-on: arc-runner + runs-on: public-docker-runner env: TOX_COMMAND: "tox --skip-missing-interpreters false" @@ -46,7 +46,7 @@ jobs: uses: ./.github/workflows/e2e.yaml build: - runs-on: arc-runner + runs-on: public-docker-runner needs: [unittest, e2e] if: startsWith(github.ref, 'refs/tags') env: diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index fb399f9b..c7aaeef4 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -14,7 +14,7 @@ env: jobs: e2e: - runs-on: e2e-runner + runs-on: private-kube-runner steps: - name: Checkout resolwe-bio-py From 50c12295a1db3b52c448e289ab4f612e9c6d5ac7 Mon Sep 17 00:00:00 2001 From: Andrej Copar Date: Mon, 27 Jan 2025 17:20:12 +0000 Subject: [PATCH 2/2] Update K3d base version to 1.30 --- .github/workflows/e2e.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index c7aaeef4..6961ac66 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -8,7 +8,7 @@ env: # Registry settings. REGISTRY: "396487289173.dkr.ecr.eu-west-1.amazonaws.com" AWS_REGION: "eu-west-1" - K3D_BASE_IMAGE: genialis/ci/k3d-base:v1.28.8-k3s1 + K3D_BASE_IMAGE: genialis/ci/k3d-base:v1.30.8-k3s1 # Environment ENV_FILE: "/workdir/e2e/config/resolwe-bio-py.env" @@ -64,7 +64,10 @@ jobs: # Work around authentication error by prefetching k3d base images docker pull ${{ env.REGISTRY }}/${{ env.K3D_BASE_IMAGE }} docker pull ${{ env.REGISTRY }}/docker.io/library/registry:2 - # TODO: Add a way to override k3d-config.yaml base image tag + docker pull ${{ env.REGISTRY }}/genialis/ci/k3d-tools:5.8.1 + docker pull ${{ env.REGISTRY }}/genialis/ci/k3d-proxy:5.8.1 + K3D_IMAGE_LOADBALANCER=${{ env.REGISTRY }}/genialis/ci/k3d-proxy:5.8.1 \ + K3D_IMAGE_TOOLS=${{ env.REGISTRY }}/genialis/ci/k3d-tools:5.8.1 \ k3d cluster create --config e2e/k3d/k3d-config.yaml - name: Add hosts to /etc/hosts