Skip to content

Commit

Permalink
Move SHA check function to TKG
Browse files Browse the repository at this point in the history
  • Loading branch information
sophia-guo committed Dec 13, 2024
1 parent 20a8871 commit c402bf7
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion functional/OpenJcePlusTests/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 0 additions & 1 deletion functional/security/Crypto/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 0 additions & 4 deletions get.sh
Original file line number Diff line number Diff line change
Expand Up @@ -808,12 +808,8 @@ 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
}
Expand Down
1 change: 0 additions & 1 deletion openjdk/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@
</if>
</else>
</if>
<checkGitRepoSha repoDir="openjdk-jdk"/>
<addTestenvProperties repoDir="openjdk-jdk" repoName="JDK${env.JDK_VERSION}"/>
</target>

Expand Down
3 changes: 0 additions & 3 deletions system/common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
</exec>
</then>
</if>
<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/STF" />
<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/STF" repoName="STF"/>
</target>
<target name="clone_systemtest">
Expand Down Expand Up @@ -181,7 +180,6 @@
</exec>
</then>
</if>
<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/aqa-systemtest" />
<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/aqa-systemtest" repoName="AQA_SYSTEMTEST" />
</target>

Expand Down Expand Up @@ -251,7 +249,6 @@
</exec>
</then>
</if>
<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/openj9-systemtest" />
<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/openj9-systemtest" repoName="OPENJ9_SYSTEMTEST"/>
</target>

Expand Down

0 comments on commit c402bf7

Please sign in to comment.