Skip to content

Add ARM64 architecture support to integration tests #7068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+95 −105
Open

Add ARM64 architecture support to integration tests #7068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
288f22d
Add ARM64 architecture support to integration tests
thc1006 Oct 25, 2025
d4c7faf
Fix install-docker.sh to support ARM64 architecture
thc1006 Oct 26, 2025
368828e
Skip backward_compatibility, query_fuzz, and querier tests on ARM64
thc1006 Oct 30, 2025
aff13a8
chore: remove deprecated // +build tags
thc1006 Nov 1, 2025
385294d
Enable integration_querier and integration_backward_compatibility on …
thc1006 Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions .github/workflows/scripts/install-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
85 changes: 64 additions & 21 deletions .github/workflows/test-build-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,19 +152,57 @@ 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
- runner: ubuntu-24.04-arm
arch: arm64
tags: integration_backward_compatibility
- runner: ubuntu-24.04-arm
arch: arm64
tags: integration_querier
steps:
- name: Upgrade golang
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
Expand Down Expand Up @@ -197,20 +235,13 @@ jobs:
docker pull consul:1.8.4
docker pull gcr.io/etcd-development/etcd:v3.4.7
if [ "$TEST_TAGS" = "integration_backward_compatibility" ]; then
docker pull quay.io/cortexproject/cortex:v1.13.1
docker pull quay.io/cortexproject/cortex:v1.13.2
docker pull quay.io/cortexproject/cortex:v1.14.0
docker pull quay.io/cortexproject/cortex:v1.14.1
docker pull quay.io/cortexproject/cortex:v1.15.0
docker pull quay.io/cortexproject/cortex:v1.15.1
docker pull quay.io/cortexproject/cortex:v1.15.2
docker pull quay.io/cortexproject/cortex:v1.15.3
docker pull quay.io/cortexproject/cortex:v1.16.0
docker pull quay.io/cortexproject/cortex:v1.16.1
docker pull quay.io/cortexproject/cortex:v1.17.0
docker pull quay.io/cortexproject/cortex:v1.17.1
docker pull quay.io/cortexproject/cortex:v1.18.0
docker pull quay.io/cortexproject/cortex:v1.18.1
docker pull quay.io/cortexproject/cortex:v1.19.0
elif [ "$TEST_TAGS" = "integration_query_fuzz" ]; then
docker pull quay.io/cortexproject/cortex:v1.18.1
docker pull quay.io/prometheus/prometheus:v3.6.0
Expand All @@ -220,19 +251,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
Expand All @@ -245,10 +286,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:
Expand Down
1 change: 0 additions & 1 deletion integration/alertmanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration_alertmanager
// +build integration_alertmanager

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/api_endpoints_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/asserts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration
// +build integration

package integration

Expand Down
45 changes: 2 additions & 43 deletions integration/backward_compatibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration_backward_compatibility
// +build integration_backward_compatibility

package integration

Expand Down Expand Up @@ -30,49 +29,9 @@ type versionsImagesFlags struct {
var (
// If you change the image tag, remember to update it in the preloading done
// by GitHub Actions too (see .github/workflows/test-build-deploy.yml).
// Per https://cortexmetrics.io/docs/configuration/v1guarantees/#flags-config-and-minor-version-upgrades,
// we only need to support backward compatibility for the last 3 minor versions.
previousVersionImages = map[string]*versionsImagesFlags{
"quay.io/cortexproject/cortex:v1.13.1": {
flagsForOldImage: func(m map[string]string) map[string]string {
m["-ingester.stream-chunks-when-using-blocks"] = "true"
return m
},
flagsForNewImage: func(m map[string]string) map[string]string {
m["-ingester.client.grpc-compression"] = "snappy"
return m
},
},
"quay.io/cortexproject/cortex:v1.13.2": {
flagsForOldImage: func(m map[string]string) map[string]string {
m["-ingester.stream-chunks-when-using-blocks"] = "true"
return m
},
flagsForNewImage: func(m map[string]string) map[string]string {
m["-ingester.client.grpc-compression"] = "snappy"
return m
},
},
"quay.io/cortexproject/cortex:v1.14.0": {
flagsForOldImage: func(m map[string]string) map[string]string {
return m
},
flagsForNewImage: func(m map[string]string) map[string]string {
m["-ingester.client.grpc-compression"] = "snappy"
return m
},
},
"quay.io/cortexproject/cortex:v1.14.1": {
flagsForOldImage: func(m map[string]string) map[string]string {
return m
},
flagsForNewImage: func(m map[string]string) map[string]string {
m["-ingester.client.grpc-compression"] = "snappy"
return m
},
},
"quay.io/cortexproject/cortex:v1.15.0": nil,
"quay.io/cortexproject/cortex:v1.15.1": nil,
"quay.io/cortexproject/cortex:v1.15.2": nil,
"quay.io/cortexproject/cortex:v1.15.3": nil,
"quay.io/cortexproject/cortex:v1.16.0": nil,
"quay.io/cortexproject/cortex:v1.16.1": nil,
"quay.io/cortexproject/cortex:v1.17.0": nil,
Expand Down
1 change: 0 additions & 1 deletion integration/blocks_storage_backends_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration
// +build integration

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/distributor_mixed_ha_samples_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/e2e/scenario_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package e2e_test

Expand Down
1 change: 0 additions & 1 deletion integration/e2e/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package e2e

Expand Down
1 change: 0 additions & 1 deletion integration/format_query_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/getting_started_single_process_config_local_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/getting_started_single_process_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/getting_started_with_gossiped_ring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/grpc_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/ingester_limits_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/ingester_metadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/ingester_sharding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/ingester_stream_push_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/integration_memberlist_single_binary_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration_memberlist
// +build integration_memberlist

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/kv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/native_histogram_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/otlp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/parquet_querier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration_query_fuzz
// +build integration_query_fuzz

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/parse_query_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build requires_docker
// +build requires_docker

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/querier_remote_read_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration_querier
// +build integration_querier

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/querier_sharding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration_querier
// +build integration_querier

package integration

Expand Down
1 change: 0 additions & 1 deletion integration/querier_tenant_federation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build integration_querier
// +build integration_querier

package integration

Expand Down
Loading