From 8d9d402622f42cc041fce733e79bfebabc06169d Mon Sep 17 00:00:00 2001
From: sophia-guo <sophia.gwf@gmail.com>
Date: Wed, 22 Jan 2025 21:26:18 -0500
Subject: [PATCH] Move SHA check function to TKG (#5819)

* Move SHA check function to TKG

* No not remove the .git repo dir

* Collecting Openj9 and Vendors repo SHA at stage time

* keep .git folder

* use git rm

* git rm quite
---
 functional/OpenJcePlusTests/build.xml |  1 -
 functional/security/Crypto/build.xml  |  1 -
 get.sh                                | 32 +++++++++------------------
 openjdk/build.xml                     |  1 -
 system/common.xml                     |  3 ---
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
index f884ea0789..f09f1c30ec 100644
--- a/functional/OpenJcePlusTests/build.xml
+++ b/functional/OpenJcePlusTests/build.xml
@@ -95,7 +95,6 @@
 			<arg value="-f"/>
 			<arg value="${repo_sha}"/>
 		</exec>
-		<checkGitRepoSha repoDir="OpenJCEPlus" />
 		<addTestenvProperties repoDir="OpenJCEPlus" repoName="OpenJCEPlus"/>
 
 		<delete dir="./OpenJCEPlus/src/main" />
diff --git a/functional/security/Crypto/build.xml b/functional/security/Crypto/build.xml
index 603c8306a3..2066875be6 100644
--- a/functional/security/Crypto/build.xml
+++ b/functional/security/Crypto/build.xml
@@ -43,7 +43,6 @@
 	</if>
 	<target name="getCryptoTest" depends="cryptoTest.check" unless="cryptoTestdir.exists">
 		<getFileWithRetry file="CryptoTest" command="git clone --depth 1 -q ${GIT_REPO}rh-openjdk/CryptoTest.git -b master CryptoTest"/>
-		<checkGitRepoSha repoDir="CryptoTest"/>
 	</target>
 	
 	<target name="init">
diff --git a/get.sh b/get.sh
index 90b95f251b..c27924935d 100755
--- a/get.sh
+++ b/get.sh
@@ -570,7 +570,6 @@ getTestKitGen()
 	echo "git checkout -q -f $tkg_sha"
 	git checkout -q -f $tkg_sha
 
-	checkTestRepoSHAs
 }
 
 getCustomJtreg()
@@ -660,8 +659,11 @@ getFunctionalTestMaterial()
 	else
 		mv openj9/test/functional functional
 	fi
-
-	rm -rf openj9
+   	
+	cd openj9
+	git rm -rqf .
+	git clean -fxd
+	cd $TESTDIR
 }
 
 getVendorTestMaterial() {
@@ -746,7 +748,11 @@ getVendorTestMaterial() {
 		fi
 
 		# clean up
-		rm -rf $dest
+		cd $dest
+		git rm -rqf .
+		git clean -fxd
+		cd $TESTDIR
+
 	done
 }
 
@@ -808,30 +814,12 @@ testJavaVersion()
 
 checkRepoSHA()
 {
-	sha_file="$TESTDIR/TKG/SHA.txt"
 	testenv_file="$TESTDIR/testenv/testenv.properties"
 
-	echo "$TESTDIR/TKG/scripts/getSHA.sh --repo_dir $1 --output_file $sha_file"
-	$TESTDIR/TKG/scripts/getSHA.sh --repo_dir $1 --output_file $sha_file
-
 	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"
diff --git a/openjdk/build.xml b/openjdk/build.xml
index 66703c0e97..4f83a4f101 100755
--- a/openjdk/build.xml
+++ b/openjdk/build.xml
@@ -232,7 +232,6 @@
 				</if>
 			</else>
 		</if>
-		<checkGitRepoSha repoDir="openjdk-jdk"/>
 		<addTestenvProperties repoDir="openjdk-jdk" repoName="JDK${env.JDK_VERSION}"/>
 	</target>
 
diff --git a/system/common.xml b/system/common.xml
index 2dc220e63c..54f406ac83 100644
--- a/system/common.xml
+++ b/system/common.xml
@@ -112,7 +112,6 @@
 				</exec>
 			</then>
 		</if>
-		<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/STF" />
 		<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/STF" repoName="STF"/>
 	</target>
 	<target name="clone_systemtest">
@@ -181,7 +180,6 @@
 				</exec>
 			</then>
 		</if>
-		<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/aqa-systemtest" />
  		<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/aqa-systemtest" repoName="AQA_SYSTEMTEST" />
 	</target>
 
@@ -251,7 +249,6 @@
 				</exec>
 			</then>
 		</if>
-		<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/openj9-systemtest" />
  		<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/openj9-systemtest" repoName="OPENJ9_SYSTEMTEST"/>
 	</target>