From ede8d5a5ab06ab3d5bbe5356972d09b9add4acaf Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Fri, 20 Dec 2024 18:36:55 -0500 Subject: [PATCH] keep .git folder --- get.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/get.sh b/get.sh index a14927882a..240bbac585 100755 --- a/get.sh +++ b/get.sh @@ -570,6 +570,7 @@ getTestKitGen() echo "git checkout -q -f $tkg_sha" git checkout -q -f $tkg_sha + checkTestRepoSHAs } getCustomJtreg() @@ -660,7 +661,9 @@ getFunctionalTestMaterial() mv openj9/test/functional functional fi - rm -rf openj9 + cd openj9 + find . -mindepth 1 ! -name ".git" ! -path "./.git/*" -exec rm -rf {} + + cd $TESTDIR } getVendorTestMaterial() { @@ -745,7 +748,10 @@ getVendorTestMaterial() { fi # clean up - rm -rf $dest + cd $dest + find . -mindepth 1 ! -name ".git" ! -path "./.git/*" -exec rm -rf {} + + cd $TESTDIR + done } @@ -807,11 +813,8 @@ testJavaVersion() checkRepoSHA() { - 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 }