Use go cross-compilation to speed up test builds on CI (#2210)

After adding Arm runners on GHA, we made it so the Arm test image is
always built. Unfortunately, because we use QEMU to build the images,
the build has gotten quite slow.

In order to speed up the build, this change makes it so we cross-compile
the binaries for all our supported platforms locally and the image build
simply copies the binaries into the final image.

Author: Molter73

.github/workflows/integration-test-containers.yml

@@ -80,6 +80,13 @@ jobs:
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Setup go and its cache
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: integration-tests/go.mod
+          cache-dependency-path: |
+            integration-tests/go.sum
+
       - name: Create Ansible Vars (inc. Secrets)
         run: |
           cat << EOF > ${{ github.workspace }}/ansible/secrets.yml
@@ -105,28 +112,6 @@ jobs:
           echo "COLLECTOR_TESTS_TAG=${COLLECTOR_TESTS_TAG}" >> "$GITHUB_ENV"
           echo "collector-tests-tag=${COLLECTOR_TESTS_TAG}" >> "$GITHUB_OUTPUT"
 
-      - name: Check if multiarch is needed
-        run: |
-          BUILD_MULTI_ARCH="false"
-
-          if [[ "${GITHUB_EVENT_NAME}" != "pull_request" ]]; then
-            BUILD_MULTI_ARCH="true"
-          fi
-
-          if [[ "${{ inputs.is-konflux }}" == "true" ]]; then
-            BUILD_MULTI_ARCH="true"
-          fi
-
-          if [[ "${{ contains(github.event.pull_request.labels.*.name, 'run-multiarch-builds') }}" == "true" ]]; then
-            BUILD_MULTI_ARCH="true"
-          fi
-
-          if [[ "${{ contains(github.event.pull_request.labels.*.name, 'run-cpaas-steps') }}" == "true" ]]; then
-            BUILD_MULTI_ARCH="true"
-          fi
-
-          echo "BUILD_MULTI_ARCH=${BUILD_MULTI_ARCH}" >> "$GITHUB_ENV"
-
       - name: Build images
         run: |
           ansible-galaxy install -r ansible/requirements.yml
@@ -135,7 +120,6 @@ jobs:
           ansible-playbook \
             --connection local -i localhost, --limit localhost \
             -e test_image="quay.io/rhacs-eng/collector-tests:${COLLECTOR_TESTS_TAG}" \
-            -e "{\"build_multi_arch\": $BUILD_MULTI_ARCH}" \
             -e @'${{ github.workspace }}/ansible/secrets.yml' \
             ansible/ci-build-tests.yml
 

ansible/ci-build-tests.yml

@@ -5,17 +5,15 @@
   environment:
 
   tasks:
-    - set_fact:
-        platforms: "linux/amd64,linux/ppc64le,linux/s390x,linux/arm64"
-      when: build_multi_arch
-
-    - set_fact:
-        platforms: "linux/amd64,linux/arm64"
-      when: not build_multi_arch
-
     - set_fact:
         collector_root: "{{ lookup('env', 'GITHUB_WORKSPACE') }}"
 
+    - name: Build test binaries
+      community.general.make:
+        chdir: "{{ collector_root }}/integration-tests"
+        target: build-all
+        jobs: "{{ ansible_facts['processor_vcpus'] }}"
+
     - name: Login to quay.io
       community.docker.docker_login:
         registry_url: quay.io
@@ -31,7 +29,7 @@
         #   - we can push the images and manifest in a single command. The make
         #     target can be used for local development and testing.
         docker buildx build --push \
-          --platform "{{ platforms }}" \
+          --platform "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x" \
           -t '{{ test_image }}' \
           {{ collector_root }}/integration-tests
       register: build_result
@@ -45,4 +43,3 @@
         registry_url: quay.io
         state: absent
       when: true
-

integration-tests/Dockerfile

@@ -1,35 +1,15 @@
-ARG TEST_ROOT="/tests"
-
-FROM golang:1.23 as builder
+FROM alpine:3.18
 
-ARG TEST_ROOT
+ARG TARGETARCH
+ARG TEST_ROOT="/tests"
 
-ENV GOCACHE=/root/.cache/go-build
+RUN apk add docker && \
+    mkdir -p $TEST_ROOT
 
-RUN mkdir -p "$TEST_ROOT"
 WORKDIR "$TEST_ROOT"
 
-# Cache dependencies
-COPY go.* "$TEST_ROOT"
-RUN go mod download
-
-COPY suites "$TEST_ROOT/suites/"
-COPY pkg "$TEST_ROOT/pkg/"
-COPY integration_test.go "$TEST_ROOT"
-COPY benchmark_test.go "$TEST_ROOT"
-COPY k8s_test.go "$TEST_ROOT"
-
-RUN --mount=type=cache,target="/root/.cache/go-build" CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go test -tags bench,k8s -c -o collector-tests
+COPY bin/$TARGETARCH/collector-tests /usr/local/bin
 
-FROM alpine:3.18
-
-ARG TEST_ROOT
-
-RUN apk add docker
-
-COPY --from=builder $TEST_ROOT/collector-tests $TEST_ROOT/collector-tests
-COPY images.yml "$TEST_ROOT"
-
-WORKDIR "$TEST_ROOT"
+COPY images.yml .
 
-ENTRYPOINT ["./collector-tests"]
+ENTRYPOINT ["collector-tests"]

integration-tests/Makefile

@@ -21,6 +21,8 @@ ifeq ($(COLLECTOR_TESTS_IMAGE),)
 COLLECTOR_TESTS_IMAGE=$(COLLECTOR_TESTS_REPO):$(COLLECTOR_TAG)
 endif
 
+GOARCH ?= $(shell go env GOARCH)
+
 SHELL=/bin/bash
 
 # Environment variable COLLECTOR_IMAGE is used by integration-tests
@@ -59,11 +61,21 @@ $(foreach element,$(ALL_TESTS),$(eval $(call make-test-target-dockerized,$(eleme
 
 .PHONY: build
 build:
-	mkdir -p bin
-	go test -tags bench,k8s -c -o bin/collector-tests
+	mkdir -p bin/$(GOARCH)
+	CGO_ENABLED=0 GOOS=linux GOARCH=$(GOARCH) go test -tags bench,k8s -c -o bin/$(GOARCH)/collector-tests
+
+ARCHS := amd64 arm64 ppc64le s390x
+
+build-%:
+	GOARCH=$(*) make build
+
+
+build-all: $(addprefix build-,$(ARCHS))
+
+.PHONY: build-all build-%
 
 .PHONY: build-image
-build-image:
+build-image: build-all
 	docker build --platform $(PLATFORM) -t $(COLLECTOR_TESTS_IMAGE) \
 		--build-arg QA_TAG=$(shell cat container/QA_TAG) \
 		$(CURDIR)