Templates current build version to pass through to test containers

Author: igooch

cloudbuild.yaml

@@ -269,6 +269,15 @@ steps:
 
         pids=()
         typeset -A waitPids    # Associative array for mapping `kubectl wait job` pid -> `kubectl wait job` output log name
+        tmpdir=$(mktemp -d)
+        trap 'rm -rf -- "$tmpdir"' EXIT SIGTERM
+
+        # Update image tags to include the current build version.
+        DevVersion="1.45.0-dev-$(git rev-parse --short=7 HEAD)"
+        export DevVersion
+        envsubst < upgradeTest.yaml > "${tmpfile}"/upgradeTest.yaml
+        envsubst < versionMap.yaml > "${tmpfile}"/versionMap.yaml
+
         # Kill all currently running child processes on exit or if a non-zero signal is seen
         trap 'echo Cleaning up any remaining running pids: $(jobs -p) ; kill $(jobs -p) 2> /dev/null || :' EXIT SIGTERM
 
@@ -326,20 +335,12 @@ steps:
             echo kubectl apply -f permissions.yaml on cluster "${testCluster}"
             kubectl apply -f permissions.yaml
             echo kubectl apply -f versionMap.yaml on cluster "${testCluster}"
-            kubectl apply -f versionMap.yaml
+            kubectl apply -f "${tmpfile}"/versionMap.yaml
             echo kubectl apply -f gameserverTemplate.yaml on cluster "${testCluster}"
             kubectl apply -f gameserverTemplate.yaml
 
-            # TODO: Replace image: us-docker.pkg.dev/agones-images/ci/upgrade-test-controller:1.45.0-dev
-            # in upgradeTest.yaml with the commit tag (e.g. 1.45.0-dev-d3956c8) and pass the same VERSION as
-            # environment variable for main.go `DevVersion = os.Getenv("DevVersion")`
-            echo COMMIT_SHA "$COMMIT_SHA"
-            echo BUILD_ID "$BUILD_ID"
-            version="1.45.0-dev-$(git rev-parse --short=7 HEAD)"
-            echo VERSION "$version"
-
             echo kubectl apply -f upgradeTest.yaml on cluster "${testCluster}"
-            kubectl apply -f upgradeTest.yaml
+            kubectl apply -f "${tmpfile}"/upgradeTest.yaml
 
             # We need to wait for job pod to be created and ready before we can wait on the job itself.
             # TODO: Once all test clusters are at Kubernetes Version >= 1.31 use `kubectl wait --for=create` instead of sleep.
@@ -348,10 +349,10 @@ steps:
             kubectl wait --for=condition=ready pod -l job-name=upgrade-test-runner --timeout=5m
 
             echo Wait for job upgrade-test-runner to complete or fail on cluster "${testCluster}"
-            kubectl wait job/upgrade-test-runner --timeout=20m --for jsonpath='{.status.conditions[*].status}'=True -o jsonpath='{.status.conditions[*].type}' | tee "${testCluster}".log &
+            kubectl wait job/upgrade-test-runner --timeout=20m --for jsonpath='{.status.conditions[*].status}'=True -o jsonpath='{.status.conditions[*].type}' | tee "${tmpfile}"/"${testCluster}".log &
             waitPid=$!
             pids+=( "$waitPid" )
-            waitPids[$waitPid]=${testCluster}.log
+            waitPids[$waitPid]="${tmpfile}"/"${testCluster}".log
           done
         done
 

test/upgrade/Makefile

@@ -27,8 +27,10 @@ REGISTRY ?=
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 root_path = $(realpath $(project_path)/)
-dev_version = 1.45.0-dev
-server_tag := $(REGISTRY)/upgrade-test-controller:$(dev_version)
+base_version = 1.45.0-dev
+# Version defaults to the short hash of the latest commit
+VERSION ?= $(base_version)-dev-$(shell git rev-parse --short=7 HEAD)
+server_tag := $(REGISTRY)/upgrade-test-controller:$(VERSION)
 
 #   _____                    _
 #  |_   _|_ _ _ __ __ _  ___| |_ ___

test/upgrade/main.go

@@ -65,7 +65,7 @@ const (
 
 var (
 	// Dev is the current development version of Agones
-	Dev = os.Getenv("Dev")
+	DevVersion = os.Getenv("DevVersion")
 	// ReleaseVersion is the latest released version of Agones (DEV - 1).
 	ReleaseVersion = os.Getenv("ReleaseVersion")
 	// PodName the name of the pod this container is running in
@@ -162,7 +162,7 @@ func configTestSetup(ctx context.Context, kubeClient *kubernetes.Clientset) []*c
 		countsAndLists := containsCountsAndLists(agonesVersion)
 		ct.agonesVersion = agonesVersion
 		if agonesVersion == "Dev" {
-			ct.agonesVersion = Dev
+			ct.agonesVersion = DevVersion
 			// Game server container cannot be created at DEV version due to go.mod only able to access
 			// published Agones versions. Use N-1 for DEV.
 			ct.gameServerPath = createGameServerFile(ReleaseVersion, countsAndLists)
@@ -299,7 +299,7 @@ func runConfigWalker(ctx context.Context, validConfigs []*configTest) {
 	for _, config := range validConfigs {
 		registry := AgonesRegistry
 		chart := HelmChart
-		if config.agonesVersion == Dev {
+		if config.agonesVersion == DevVersion {
 			// TODO: Update to templated value for registry and chart for Dev build
 			continue
 		}

test/upgrade/upgradeTest.yaml

@@ -26,8 +26,7 @@ spec:
     spec:
       containers:
         - name: upgrade-test-controller
-          # TODO: Update image name to use a templated value for current Dev version
-          image: us-docker.pkg.dev/agones-images/ci/upgrade-test-controller:1.45.0-dev
+          image: us-docker.pkg.dev/agones-images/ci/upgrade-test-controller:${DevVersion}
           imagePullPolicy: Always
           env:
             - name: PodName

test/upgrade/versionMap.yaml

@@ -18,7 +18,7 @@ kind: ConfigMap
 metadata:
   name: version-map
 data:
-  Dev: "1.45.0-dev"
+  DevVersion: ${DevVersion}
   ReleaseVersion: "1.44.0"
   version-mappings.json: |
     {