From 2f5f9ccb071d5d83dbeb57813f9cc8f97218805e Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> Date: Thu, 30 Apr 2026 00:07:40 -0700 Subject: [PATCH 1/2] Login to docker to run docker images The buildx step is not needed in integration anymore Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --- .github/workflows/scripts/install-docker.sh | 3 +++ .github/workflows/test-build-deploy.yml | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scripts/install-docker.sh b/.github/workflows/scripts/install-docker.sh index a432736b8b5..3eacf407160 100755 --- a/.github/workflows/scripts/install-docker.sh +++ b/.github/workflows/scripts/install-docker.sh @@ -28,4 +28,7 @@ mkdir -vp ~/.docker/cli-plugins/ curl --silent -L "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-$BUILDX_ARCH" > ~/.docker/cli-plugins/docker-buildx chmod a+x ~/.docker/cli-plugins/docker-buildx mv /tmp/docker/* /usr/bin +if [ -n "$DOCKER_REGISTRY_PASSWORD" ]; then + docker login -u "$DOCKER_REGISTRY_USER" -p "$DOCKER_REGISTRY_PASSWORD" +fi docker run --privileged --rm tonistiigi/binfmt --install all diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index a4d14d1f8f6..96e913d610e 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -135,6 +135,9 @@ jobs: git config --system --add safe.directory $GITHUB_WORKSPACE - name: Install Docker Client run: ./.github/workflows/scripts/install-docker.sh + env: + DOCKER_REGISTRY_USER: ${{secrets.DOCKER_REGISTRY_USER}} + DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }} - name: Sym Link Expected Path to Workspace run: | mkdir -p /go/src/github.com/cortexproject/cortex @@ -237,8 +240,6 @@ jobs: go-version: 1.26.2 - name: Checkout Repo uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - - name: Install Docker Client - run: sudo ./.github/workflows/scripts/install-docker.sh - name: Sym Link Expected Path to Workspace run: | sudo mkdir -p /go/src/github.com/cortexproject/cortex @@ -303,8 +304,6 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - - name: Install Docker Client - run: sudo ./.github/workflows/scripts/install-docker.sh - name: Download Docker Images Artifact uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0 with: @@ -336,6 +335,9 @@ jobs: git config --system --add safe.directory $GITHUB_WORKSPACE - name: Install Docker Client run: ./.github/workflows/scripts/install-docker.sh + env: + DOCKER_REGISTRY_USER: ${{secrets.DOCKER_REGISTRY_USER}} + DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }} - name: Sym link Expected Path to Workspace run: | mkdir -p /go/src/github.com/cortexproject/cortex From 2bbd90139372fccd36d15abca9ef5b41da764f52 Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> Date: Thu, 30 Apr 2026 10:05:17 -0700 Subject: [PATCH 2/2] Upgrade to etcd 3.5.29 Libraries are already using 3.5 Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --- .github/workflows/test-build-deploy.yml | 2 +- integration/e2e/images/images.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index 96e913d610e..bbc50e9c874 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -261,7 +261,7 @@ jobs: run: | docker pull minio/minio:RELEASE.2024-05-28T17-19-04Z docker pull consul:1.8.4 - docker pull gcr.io/etcd-development/etcd:v3.4.7 + docker pull quay.io/coreos/etcd:v3.5.29 if [ "$TEST_TAGS" = "integration_backward_compatibility" ]; then docker pull quay.io/cortexproject/cortex:v1.16.1 docker pull quay.io/cortexproject/cortex:v1.17.2 diff --git a/integration/e2e/images/images.go b/integration/e2e/images/images.go index a003f1557b7..0cf845f976d 100644 --- a/integration/e2e/images/images.go +++ b/integration/e2e/images/images.go @@ -10,6 +10,6 @@ var ( Redis = "docker.io/redis:7.0.4-alpine" Minio = "minio/minio:RELEASE.2024-05-28T17-19-04Z" Consul = "consul:1.8.4" - ETCD = "gcr.io/etcd-development/etcd:v3.4.7" + ETCD = "quay.io/coreos/etcd:v3.5.29" Prometheus = "quay.io/prometheus/prometheus:v3.8.1" )