Using retry function to clone stf (#3738)

Signed-off-by: renfeiw <[email protected]>
adoptium · Jun 9, 2022 · 212c831 · 212c831
1 parent d5e241d
commit 212c831
Showing 1 changed file with 3 additions and 20 deletions.
diff --git a/system/common.xml b/system/common.xml
@@ -48,13 +48,7 @@
 		</if>
 	</target>
 	<target name="clone_stf">
-		<echo message="git clone -q ${stf_repo} "/>
-		<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}">
-			<arg value="clone" />
-			<arg value="-q"/>
-			<arg value="${stf_repo}"/>
-		</exec>
-
+		<getFileWithRetry file="STF" command="git clone -q ${stf_repo}" dest="${SYSTEMTEST_ROOT}"/>
 		<echo message="git rev-parse ${stf_branch} "/>
 		<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/STF" outputproperty="stf_sha1" resultproperty="code">
 			<arg value="rev-parse"/>
@@ -122,13 +116,7 @@
 		<addTestenvProperties repoDir="${SYSTEMTEST_ROOT}/STF" repoName="STF"/>
 	</target>
 	<target name="clone_systemtest">
-		<echo message="git clone -q ${openjdk_systemtest_repo} "/>
-		<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}">
-			<arg value="clone" />
-			<arg value="-q"/>
-			<arg value="${openjdk_systemtest_repo}"/>
-		</exec>
-
+		<getFileWithRetry file="aqa-systemtest" command="git clone -q ${openjdk_systemtest_repo}" dest="${SYSTEMTEST_ROOT}"/>
 		<echo message="git rev-parse ${openjdk_systemtest_branch} "/>
 		<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/aqa-systemtest" outputproperty="openjdk_systemtest_sha1" resultproperty="code">
 			<arg value="rev-parse"/>
@@ -198,12 +186,7 @@
 	</target>
 
 	<target name="clone_openj9-systemtest">
-		<echo message="git clone -q ${openj9_systemtest_repo} "/>
-		<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}">
-			<arg value="clone" />
-			<arg value="-q"/>
-			<arg value="${openj9_systemtest_repo}"/>
-		</exec>
+		<getFileWithRetry file="openj9-systemtest" command="git clone -q ${openj9_systemtest_repo}" dest="${SYSTEMTEST_ROOT}"/>
 		<echo message="git rev-parse ${openj9_systemtest_branch} "/>
 		<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/openj9-systemtest" outputproperty="openj9_systemtest_sha1" resultproperty="code">
 			<arg value="rev-parse"/>