Skip to content

Commit

Permalink
get rid of the change related to pr#2911
Browse files Browse the repository at this point in the history
  • Loading branch information
@xius666
xius666 committed Sep 29, 2021
1 parent 2121589 commit 9511a2b
Showing 1 changed file with 15 additions and 79 deletions.
94 changes: 15 additions & 79 deletions system/common.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,50 +130,18 @@
</if>
<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/stf" />
</target>

<target name="clone_systemtest">
<echo message="git clone -q ${openjdk_systemtest_repo} "/>
<echo message="Cloning from: ${openjdk_systemtest_repo} -b ${openjdk_systemtest_branch}"/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}">
<arg value="clone" />
<arg value="-q"/>
<arg value="${openjdk_systemtest_repo}"/>
</exec>

<echo message="git rev-parse ${openjdk_systemtest_branch} "/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/aqa-systemtest" outputproperty="openjdk_systemtest_sha" resultproperty="code">
<arg value="rev-parse"/>
<arg value="clone" />
<arg value="--depth" />
<arg value="1" />
<arg value="--single-branch" />
<arg value="-b"/>
<arg value="${openjdk_systemtest_branch}"/>
<arg value="${openjdk_systemtest_repo}"/>
</exec>
<if>
<equals arg1="${code}" arg2="128"/>
<then>
<echo message="git rev-parse origin/${openjdk_systemtest_branch}"/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/aqa-systemtest" outputproperty="openjdk_systemtest_sha" resultproperty="code2">
<arg value="rev-parse"/>
<arg value="origin/${openjdk_systemtest_branch}"/>
</exec>
<if>
<equals arg1="${code2}" arg2="128"/>
<then>
<echo message="This branch does not exist!"/>
</then>
</if>
</then>
</if>

<if>
<isset property="openjdk_systemtest_sha"/>
<then>
<echo message="git checkout -q -f ${openjdk_systemtest_sha} "/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/aqa-systemtest" >
<arg value="checkout"/>
<arg value="-q"/>
<arg value="-f"/>
<arg value="${openjdk_systemtest_sha}"/>
</exec>
</then>
</if>

<if>
<isset property="isZOS" />
<then>
Expand All @@ -199,48 +167,15 @@
</target>

<target name="clone_openj9-systemtest">
<echo message="git clone -q ${openj9_systemtest_repo} "/>
<echo message="Cloning from: ${openj9_systemtest_repo} -b ${openj9_systemtest_branch}"/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}">
<arg value="clone" />
<arg value="-q"/>
<arg value="${openj9_systemtest_repo}"/>
</exec>

<echo message="git rev-parse ${openj9_systemtest_branch} "/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/openj9-systemtest" outputproperty="openj9_systemtest_sha" resultproperty="code">
<arg value="rev-parse"/>
<arg value="clone" />
<arg value="--depth" />
<arg value="1" />
<arg value="-b"/>
<arg value="${openj9_systemtest_branch}"/>
<arg value="${openj9_systemtest_repo}"/>
</exec>
<if>
<equals arg1="${code}" arg2="128"/>
<then>
<echo message="git rev-parse origin/${openj9_systemtest_branch}"/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/openj9-systemtest" outputproperty="openj9_systemtest_sha" resultproperty="code2">
<arg value="rev-parse"/>
<arg value="origin/${openj9_systemtest_branch}"/>
</exec>
<if>
<equals arg1="${code2}" arg2="128"/>
<then>
<echo message="This branch does not exist!"/>
</then>
</if>
</then>
</if>

<if>
<isset property="openj9_systemtest_sha"/>
<then>
<echo message="git checkout -q -f ${openj9_systemtest_sha} "/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/openj9-systemtest" >
<arg value="checkout"/>
<arg value="-q"/>
<arg value="-f"/>
<arg value="${openj9_systemtest_sha}"/>
</exec>
</then>
</if>

<if>
<isset property="isZOS" />
<then>
Expand All @@ -265,6 +200,7 @@
<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/openj9-systemtest" />
</target>


<target name="check_systemtest" depends="common_init">
<if>
<not>
Expand Down

0 comments on commit 9511a2b

Please sign in to comment.