From 26b8c9f586bee29dc47cac5fec856eb9daa8601a Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Tue, 19 May 2020 20:54:41 -0700 Subject: [PATCH] [SPARK-31766][K8S][TESTS] Add Spark version prefix to K8s UUID test image tag --- .../scripts/setup-integration-test-env.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh b/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh index ab906604fce06..2e72ff8e55bfa 100755 --- a/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh +++ b/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh @@ -25,6 +25,7 @@ IMAGE_REPO="docker.io/kubespark" IMAGE_TAG="N/A" JAVA_IMAGE_TAG="8-jre-slim" SPARK_TGZ="N/A" +MVN="$TEST_ROOT_DIR/build/mvn" # Parse arguments while (( "$#" )); do @@ -84,7 +85,11 @@ fi # If there is a specific Spark image skip building and extraction/copy if [[ $IMAGE_TAG == "N/A" ]]; then - IMAGE_TAG=$(uuidgen); + VERSION=$("$MVN" help:evaluate -Dexpression=project.version \ + | grep -v "INFO"\ + | grep -v "WARNING"\ + | tail -n 1) + IMAGE_TAG=${VERSION}_$(uuidgen) cd $SPARK_INPUT_DIR # OpenJDK base-image tag (e.g. 8-jre-slim, 11-jre-slim)