From d90a2878317297cbfaf60babb22824537443b42a Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Fri, 24 Jan 2025 11:18:59 +1100 Subject: [PATCH] chore: use supporting images --- .github/workflows/test-suite.yaml | 4 ++-- Makefile | 4 ++-- charts/lagoon-core/ci/testlagoon-main-override.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index 97ae7986..110360bd 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -143,8 +143,8 @@ jobs: (contains(github.event.pull_request.labels.*.name, 'next-release')) run: | yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' ./charts/lagoon-core/ci/linter-values.yaml ./charts/lagoon-core/ci/testlagoon-main-override.yaml - make install-lagoon IMAGE_REGISTRY=testlagoon IMAGE_TAG=main OVERRIDE_BUILD_DEPLOY_DIND_IMAGE=uselagoon/build-deploy-image:main OVERRIDE_ACTIVE_STANDBY_TASK_IMAGE=testlagoon/task-activestandby:main - make -j8 -O fill-test-ci-values TESTS=[${{ matrix.test }}] IMAGE_REGISTRY=testlagoon IMAGE_TAG=main OVERRIDE_BUILD_DEPLOY_DIND_IMAGE=uselagoon/build-deploy-image:main OVERRIDE_ACTIVE_STANDBY_TASK_IMAGE=testlagoon/task-activestandby:main + make install-lagoon IMAGE_REGISTRY=testlagoon OVERRIDE_BUILD_DEPLOY_DIND_IMAGE=uselagoon/build-deploy-image:main OVERRIDE_ACTIVE_STANDBY_TASK_IMAGE=testlagoon/task-activestandby:main + make -j8 -O fill-test-ci-values TESTS=[${{ matrix.test }}] IMAGE_REGISTRY=testlagoon OVERRIDE_BUILD_DEPLOY_DIND_IMAGE=uselagoon/build-deploy-image:main OVERRIDE_ACTIVE_STANDBY_TASK_IMAGE=testlagoon/task-activestandby:main - name: Free up some disk space if: | diff --git a/Makefile b/Makefile index 1c0fb28a..9d38541e 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,12 @@ TESTS = [api] # IMAGE_TAG controls the tag used for container images in the lagoon-core, # lagoon-remote, and lagoon-test charts. If IMAGE_TAG is not set, it will fall # back to the version set in the CI values file, then to the chart default. -IMAGE_TAG = +IMAGE_TAG = pr-3816 # IMAGE_REGISTRY controls the registry used for container images in the # lagoon-core, lagoon-remote, and lagoon-test charts. If IMAGE_REGISTRY is not # set, it will fall back to the version set in the chart values files. This # only affects lagoon-core, lagoon-remote, and the fill-test-ci-values target. -IMAGE_REGISTRY = uselagoon +IMAGE_REGISTRY = testlagoon # if OVERRIDE_BUILD_DEPLOY_DIND_IMAGE is not set, it will fall back to the # controller default (uselagoon/kubectl-build-deploy-dind:latest). OVERRIDE_BUILD_DEPLOY_DIND_IMAGE = diff --git a/charts/lagoon-core/ci/testlagoon-main-override.yaml b/charts/lagoon-core/ci/testlagoon-main-override.yaml index 80201005..cfe7f801 100644 --- a/charts/lagoon-core/ci/testlagoon-main-override.yaml +++ b/charts/lagoon-core/ci/testlagoon-main-override.yaml @@ -1,4 +1,4 @@ -imageTag: "main" +imageTag: "pr-3816" api: image: