Allow Docker registry, Kind and NGINX images to be configured via env…

… variables. Resolves #2106

README.md

@@ -152,5 +152,18 @@ To test locally in running Kind clusters, run:
 $ go test -v ./test/e2e/xsite/ -timeout 30m
 ```
 
+## Arm Support
+In order to test on ARM machines locally, it's necessary for a few changes to be made.
+
+1. `scripts/ci/kind.sh` needs to be executed with the following env variables:
+
+```bash
+DOCKER_REGISTRY_IMAGE="registry:2"
+KINDEST_IMAGE="kindest/node"
+KINDEST_NODE_VERSION="v1.28.7" # Must be >= 1.28.x to ensure ARM support works as expected
+```
+
+2. When executing `make infinispan-test`, set `TEST_NGINX_IMAGE="nginx"` so a multi-arch nginx container is used.
+
 ## Java Integration Tests
 TODO

scripts/ci/kind.sh

@@ -3,6 +3,8 @@
 set -o errexit
 
 SERVER_TAGS=${SERVER_TAGS:-'13.0.10.Final 14.0.1.Final 14.0.6.Final 14.0.9.Final 14.0.13.Final 14.0.17.Final 14.0.19.Final 14.0.20.Final 14.0.21.Final 14.0.24.Final 14.0.27.Final 14.0 15.0.0.Final 15.0.3.Final 15.0.4.Final 15.0'}
+DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-"quay.io/infinispan-test/registry:2"}
+KINDEST_IMAGE=${KINDEST_IMAGE:-"quay.io/infinispan-test/kindest-node"}
 KINDEST_NODE_VERSION=${KINDEST_NODE_VERSION:-'v1.24.15'}
 KIND_SUBNET=${KIND_SUBNET-172.172.0.0}
 
@@ -15,7 +17,7 @@ running="$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || t
 if [ "${running}" != 'true' ]; then
   docker run \
     -d --restart=always -p "127.0.0.1:${reg_port}:5000" --name "${reg_name}" \
-    quay.io/infinispan-test/registry:2
+    ${DOCKER_REGISTRY_IMAGE}
 fi
 
 # create a cluster with the local registry enabled in containerd
@@ -28,7 +30,7 @@ containerdConfigPatches:
     endpoint = ["http://${reg_name}:5000"]
 nodes:
   - role: control-plane
-    image: quay.io/infinispan-test/kindest-node:${KINDEST_NODE_VERSION}
+    image: ${KINDEST_IMAGE}:${KINDEST_NODE_VERSION}
     extraPortMappings:
       - containerPort: 30222
         hostPort: 11222

test/e2e/utils/constants.go

@@ -41,7 +41,7 @@ var (
 	Platform       = os.Getenv("TESTING_PLATFORM")
 
 	WebServerName       = "external-libs-web-server"
-	WebServerImageName  = "quay.io/openshift-scale/nginx"
+	WebServerImageName  = constants.GetEnvWithDefault("TEST_NGINX_IMAGE", "quay.io/openshift-scale/nginx")
 	WebServerRootFolder = "/usr/share/nginx/html"
 	WebServerPortNumber = 8080