cortexproject · thc1006 · Oct 25, 2025 · Oct 26, 2025 · Oct 30, 2025 · Nov 1, 2025
diff --git a/.github/workflows/scripts/install-docker.sh b/.github/workflows/scripts/install-docker.sh
@@ -2,10 +2,30 @@
 
 set -x
 VER="28.0.4"
-curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
+
+# Detect architecture
+ARCH=$(uname -m)
+case $ARCH in
+  x86_64)
+    DOCKER_ARCH="x86_64"
+    BUILDX_ARCH="amd64"
+    ;;
+  aarch64)
+    DOCKER_ARCH="aarch64"
+    BUILDX_ARCH="arm64"
+    ;;
+  *)
+    echo "Unsupported architecture: $ARCH"
+    exit 1
+    ;;
+esac
+
+echo "Installing Docker $VER for architecture: $ARCH (docker: $DOCKER_ARCH, buildx: $BUILDX_ARCH)"
+
+curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/$DOCKER_ARCH/docker-$VER.tgz
 tar -xz -C /tmp -f /tmp/docker-$VER.tgz
 mkdir -vp ~/.docker/cli-plugins/
-curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-$BUILDX_ARCH" > ~/.docker/cli-plugins/docker-buildx
 chmod a+x ~/.docker/cli-plugins/docker-buildx
 mv /tmp/docker/* /usr/bin
 docker run --privileged --rm tonistiigi/binfmt --install all
diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
@@ -152,19 +152,51 @@ jobs:
 
   integration:
     needs: build
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 50
     strategy:
       fail-fast: false
       matrix:
-        tags:
-          - requires_docker
-          - integration_alertmanager
-          - integration_backward_compatibility
-          - integration_memberlist
-          - integration_querier
-          - integration_ruler
-          - integration_query_fuzz
-          - integration_remote_write_v2
+        include:
+          - runner: ubuntu-24.04
+            arch: amd64
+            tags: requires_docker
+          - runner: ubuntu-24.04
+            arch: amd64
+            tags: integration_alertmanager
+          - runner: ubuntu-24.04
+            arch: amd64
+            tags: integration_backward_compatibility
+          - runner: ubuntu-24.04
+            arch: amd64
+            tags: integration_memberlist
+          - runner: ubuntu-24.04
+            arch: amd64
+            tags: integration_querier
+          - runner: ubuntu-24.04
+            arch: amd64
+            tags: integration_ruler
+          - runner: ubuntu-24.04
+            arch: amd64
+            tags: integration_query_fuzz
+          - runner: ubuntu-24.04
+            arch: amd64
+            tags: integration_remote_write_v2
+          - runner: ubuntu-24.04-arm
+            arch: arm64
+            tags: requires_docker
+          - runner: ubuntu-24.04-arm
+            arch: arm64
+            tags: integration_alertmanager
+          - runner: ubuntu-24.04-arm
+            arch: arm64
+            tags: integration_memberlist
+          - runner: ubuntu-24.04-arm
+            arch: arm64
+            tags: integration_ruler
+          - runner: ubuntu-24.04-arm
+            arch: arm64
+            tags: integration_remote_write_v2
     steps:
       - name: Upgrade golang
         uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
@@ -220,19 +252,29 @@ jobs:
         env:
           TEST_TAGS: ${{ matrix.tags }}
       - name: Integration Tests
+        timeout-minutes: 45
         run: |
           export CORTEX_IMAGE_PREFIX="${IMAGE_PREFIX:-quay.io/cortexproject/}"
           export IMAGE_TAG=$(make image-tag)
-          export CORTEX_IMAGE="${CORTEX_IMAGE_PREFIX}cortex:$IMAGE_TAG-amd64"
+          export CORTEX_IMAGE="${CORTEX_IMAGE_PREFIX}cortex:${IMAGE_TAG}-${{ matrix.arch }}"
           export CORTEX_CHECKOUT_DIR="/go/src/github.com/cortexproject/cortex"
-          echo "Running integration tests with image: $CORTEX_IMAGE"
+          echo "Running integration tests on ${{ matrix.arch }} with image: ${CORTEX_IMAGE}"
           go test -tags=slicelabels,integration,${{ matrix.tags }} -timeout 2400s -v -count=1 ./integration/...
         env:
           IMAGE_PREFIX: ${{ secrets.IMAGE_PREFIX }}
 
   integration-configs-db:
     needs: build
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: ubuntu-24.04
+            arch: amd64
+          - runner: ubuntu-24.04-arm
+            arch: arm64
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -245,10 +287,12 @@ jobs:
       - name: Extract Docker Images Archive
         run: tar -xvf images.tar -C /
       - name: Run Integration Configs Tests
+        timeout-minutes: 15
         # Github Actions does not support TTY in their default runners yet
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
+          echo "Running configs integration tests on ${{ matrix.arch }}"
           make BUILD_IMAGE=quay.io/cortexproject/build-image:master-59491e9aae TTY='' configs-integration-test
 
   deploy_website:

diff --git a/integration/alertmanager_test.go b/integration/alertmanager_test.go
@@ -1,5 +1,4 @@
 //go:build integration_alertmanager
-// +build integration_alertmanager
 
 package integration
 

diff --git a/integration/api_endpoints_test.go b/integration/api_endpoints_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/asserts.go b/integration/asserts.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package integration
 

diff --git a/integration/backward_compatibility_test.go b/integration/backward_compatibility_test.go
@@ -1,5 +1,4 @@
 //go:build integration_backward_compatibility
-// +build integration_backward_compatibility
 
 package integration
 

diff --git a/integration/blocks_storage_backends_test.go b/integration/blocks_storage_backends_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/configs.go b/integration/configs.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package integration
 

diff --git a/integration/distributor_mixed_ha_samples_test.go b/integration/distributor_mixed_ha_samples_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/e2e/scenario_test.go b/integration/e2e/scenario_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package e2e_test
 

diff --git a/integration/e2e/service_test.go b/integration/e2e/service_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package e2e
 

diff --git a/integration/format_query_api_test.go b/integration/format_query_api_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/getting_started_single_process_config_local_test.go b/integration/getting_started_single_process_config_local_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/getting_started_single_process_config_test.go b/integration/getting_started_single_process_config_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/getting_started_with_gossiped_ring_test.go b/integration/getting_started_with_gossiped_ring_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/grpc_server_test.go b/integration/grpc_server_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/ingester_limits_test.go b/integration/ingester_limits_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/ingester_metadata_test.go b/integration/ingester_metadata_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/ingester_sharding_test.go b/integration/ingester_sharding_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/ingester_stream_push_test.go b/integration/ingester_stream_push_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/integration_memberlist_single_binary_test.go b/integration/integration_memberlist_single_binary_test.go
@@ -1,5 +1,4 @@
 //go:build integration_memberlist
-// +build integration_memberlist
 
 package integration
 

diff --git a/integration/kv_test.go b/integration/kv_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/native_histogram_test.go b/integration/native_histogram_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/otlp_test.go b/integration/otlp_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/parquet_querier_test.go b/integration/parquet_querier_test.go
@@ -1,5 +1,4 @@
 //go:build integration_query_fuzz
-// +build integration_query_fuzz
 
 package integration
 

diff --git a/integration/parse_query_api_test.go b/integration/parse_query_api_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/querier_remote_read_test.go b/integration/querier_remote_read_test.go
@@ -1,5 +1,4 @@
 //go:build integration_querier
-// +build integration_querier
 
 package integration
 

diff --git a/integration/querier_sharding_test.go b/integration/querier_sharding_test.go
@@ -1,5 +1,4 @@
 //go:build integration_querier
-// +build integration_querier
 
 package integration
 

diff --git a/integration/querier_tenant_federation_test.go b/integration/querier_tenant_federation_test.go
@@ -1,5 +1,4 @@
 //go:build integration_querier
-// +build integration_querier
 
 package integration
 

diff --git a/integration/querier_test.go b/integration/querier_test.go
@@ -1,5 +1,4 @@
 //go:build integration_querier
-// +build integration_querier
 
 package integration
 

diff --git a/integration/query_frontend_test.go b/integration/query_frontend_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/query_fuzz_test.go b/integration/query_fuzz_test.go
@@ -1,5 +1,4 @@
 //go:build integration_query_fuzz
-// +build integration_query_fuzz
 
 package integration
 

diff --git a/integration/query_response_compression_test.go b/integration/query_response_compression_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/remote_write_v2_test.go b/integration/remote_write_v2_test.go
@@ -1,5 +1,4 @@
 //go:build integration_remote_write_v2
-// +build integration_remote_write_v2
 
 package integration
 

diff --git a/integration/resource_based_limiter_test.go b/integration/resource_based_limiter_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/ruler_test.go b/integration/ruler_test.go
@@ -1,5 +1,4 @@
 //go:build integration_ruler
-// +build integration_ruler
 
 package integration
 

diff --git a/integration/runtime_config_test.go b/integration/runtime_config_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/utf8_test.go b/integration/utf8_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/integration/util.go b/integration/util.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package integration
 

diff --git a/integration/zone_aware_test.go b/integration/zone_aware_test.go
@@ -1,5 +1,4 @@
 //go:build requires_docker
-// +build requires_docker
 
 package integration
 

diff --git a/pkg/configs/db/dbtest/integration.go b/pkg/configs/db/dbtest/integration.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package dbtest
 

diff --git a/pkg/configs/db/dbtest/unit.go b/pkg/configs/db/dbtest/unit.go
@@ -1,5 +1,4 @@
 //go:build !integration
-// +build !integration
 
 package dbtest