From 726a2930bd16a04ba7f3fe48e4beccda602510ed Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Tue, 17 Dec 2024 16:55:10 -0500
Subject: [PATCH] Collecting Openj9 and Vendors repo SHA at stage time

---
 get.sh | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/get.sh b/get.sh
index 81d299c7ff..5c595ed479 100755
--- a/get.sh
+++ b/get.sh
@@ -660,6 +660,8 @@ getFunctionalTestMaterial()
 	else
 		mv openj9/test/functional functional
 	fi
+
+	rm -rf openj9
 }
 
 getVendorTestMaterial() {
@@ -742,6 +744,9 @@ getVendorTestMaterial() {
 			# already in TESTDIR, thus copy the entire vendor repo content to current directory
 			cp -r $dest/* ./
 		fi
+
+		# clean up
+		rm -rf $dest
 	done
 }
 
@@ -803,26 +808,15 @@ testJavaVersion()
 
 checkRepoSHA()
 {
-	testenv_file="$TESTDIR/testenv/testenv.properties"
+	sha_file="$TESTDIR/TKG/SHAs.txt"
+	echo "$TESTDIR/TKG/scripts/getSHAs.sh --repo_dir $1 --output_file $sha_file"
+	$TESTDIR/TKG/scripts/getSHAs.sh --test_root_dir $1 --shas_file $sha_file
 
+	testenv_file="$TESTDIR/testenv/testenv.properties"
 	echo "$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2"
 	$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2
 }
 
-checkTestRepoSHAs()
-{
-	echo "check adoptium repo and TKG repo SHA"
-
-	output_file="$TESTDIR/TKG/SHA.txt"
-	if [ -e ${output_file} ]; then
-		echo "rm $output_file"
-		rm ${output_file}
-	fi
-
-	checkRepoSHA "$TESTDIR" "ADOPTOPENJDK"
-	checkRepoSHA "$TESTDIR/TKG" "TKG"
-}
-
 checkOpenJ9RepoSHA()
 {
 	echo "check OpenJ9 Repo sha"