rename

test/actions.github.com/anonymous-proxy-setup.test.sh

@@ -51,7 +51,7 @@ function install_scale_set() {
         --set proxy.https.url="http://host.minikube.internal:3128" \
         --set "proxy.noProxy[0]=10.96.0.1:443" \
         "${ROOT_DIR}/charts/gha-runner-scale-set" \
-        --version="${IMAGE_VERSION}" \
+        --version="${VERSION}" \
         --debug
 
     if ! NAME="${SCALE_SET_NAME}" NAMESPACE="${ARC_NAMESPACE}" wait_for_scale_set; then

test/actions.github.com/auth-proxy-setup.test.sh

@@ -66,7 +66,7 @@ function install_scale_set() {
         --set proxy.https.credentialSecretRef="proxy-auth" \
         --set "proxy.noProxy[0]=10.96.0.1:443" \
         "${ROOT_DIR}/charts/gha-runner-scale-set" \
-        --version="${IMAGE_VERSION}" \
+        --version="${VERSION}" \
         --debug
 
     if ! NAME="${SCALE_SET_NAME}" NAMESPACE="${ARC_NAMESPACE}" wait_for_scale_set; then

test/actions.github.com/default-setup.test.sh

@@ -41,7 +41,7 @@ function install_scale_set() {
         --set githubConfigUrl="https://github.com/${TARGET_ORG}/${TARGET_REPO}" \
         --set githubConfigSecret.github_token="${GITHUB_TOKEN}" \
         "${ROOT_DIR}/charts/gha-runner-scale-set" \
-        --version="${IMAGE_VERSION}" \
+        --version="${VERSION}" \
         --debug
 
     if ! NAME="${SCALE_SET_NAME}" NAMESPACE="${ARC_NAMESPACE}" wait_for_scale_set; then

test/actions.github.com/dind-mode-setup.test.sh

@@ -42,7 +42,7 @@ function install_scale_set() {
         --set githubConfigSecret.github_token="${GITHUB_TOKEN}" \
         --set containerMode.type="dind" \
         "${ROOT_DIR}/charts/gha-runner-scale-set" \
-        --version="${IMAGE_VERSION}" \
+        --version="${VERSION}" \
         --debug
 
     if ! NAME="${SCALE_SET_NAME}" NAMESPACE="${ARC_NAMESPACE}" wait_for_scale_set; then

test/actions.github.com/helper.sh

@@ -9,25 +9,26 @@ ROOT_DIR="$(realpath "${DIR}/../..")"
 export TARGET_ORG="${TARGET_ORG:-actions-runner-controller}"
 export TARGET_REPO="${TARGET_REPO:-arc_e2e_test_dummy}"
 export IMAGE_NAME="${IMAGE_NAME:-arc-test-image}"
-export IMAGE_VERSION="${VERSION:-$(yq .version < "${ROOT_DIR}/charts/gha-runner-scale-set-controller/Chart.yaml")}"
+export VERSION="${VERSION:-$(yq .version < "${ROOT_DIR}/charts/gha-runner-scale-set-controller/Chart.yaml")}"
-export IMAGE_TAG="${IMAGE_NAME}:${IMAGE_VERSION}"
+export IMAGE_TAG="${VERSION}"
+export IMAGE="${IMAGE_NAME}:${IMAGE_TAG}"
 
 export PLATFORMS="linux/amd64"
 export COMMIT_SHA="$(git rev-parse HEAD)"
 
 function build_image() {
-    echo "Building ARC image ${IMAGE_TAG}"
+    echo "Building ARC image ${IMAGE}"
 
     cd "${ROOT_DIR}" || exit 1
 
 	docker buildx build --platform "${PLATFORMS}" \
-		--build-arg VERSION="${IMAGE_VERSION}" \
+		--build-arg VERSION="${VERSION}" \
 		--build-arg COMMIT_SHA="${COMMIT_SHA}" \
-		-t "${IMAGE_TAG}" \
+		-t "${IMAGE}" \
 		-f Dockerfile \
 		. --load
 
-    echo "Created image ${IMAGE_TAG}"
+    echo "Created image ${IMAGE}"
     cd - || exit 1
 }
 
@@ -39,7 +40,7 @@ function create_cluster() {
     minikube start
 
     echo "Loading image into minikube cluster"
-    minikube image load "${IMAGE_TAG}"
+    minikube image load "${IMAGE}"
 }
 
 function delete_cluster() {

test/actions.github.com/kubernetes-mode-setup.test.sh

@@ -50,7 +50,7 @@ function install_scale_set() {
         --set containerMode.kubernetesModeWorkVolumeClaim.storageClassName="openebs-hostpath" \
         --set containerMode.kubernetesModeWorkVolumeClaim.resources.requests.storage="1Gi" \
         "${ROOT_DIR}/charts/gha-runner-scale-set" \
-        --version="${IMAGE_VERSION}" \
+        --version="${VERSION}" \
         --debug
 
     if ! NAME="${SCALE_SET_NAME}" NAMESPACE="${ARC_NAMESPACE}" wait_for_scale_set; then

test/actions.github.com/single-namespace-setup.test.sh

@@ -42,7 +42,7 @@ function install_scale_set() {
         --set githubConfigUrl="https://github.com/${TARGET_ORG}/${TARGET_REPO}" \
         --set githubConfigSecret.github_token="${GITHUB_TOKEN}" \
         "${ROOT_DIR}/charts/gha-runner-scale-set" \
-        --version="${IMAGE_VERSION}" \
+        --version="${VERSION}" \
         --debug
 
     if ! NAME="${SCALE_SET_NAME}" NAMESPACE="${ARC_NAMESPACE}" wait_for_scale_set; then