Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

accept sha for system test #2911

Merged
merged 33 commits into from
Oct 12, 2021
Merged

accept sha for system test #2911

Changes from 32 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5262525
finish adding GIT_ISSUE_STATUS to the json
xius666 Sep 18, 2021
d36dec3
add error handling
xius666 Sep 18, 2021
ff7343a
delete output file
xius666 Sep 18, 2021
e9000af
change the name of input file
xius666 Sep 20, 2021
cf58056
Merge branch 'adoptium:master' into master
xius666 Sep 20, 2021
9e82dce
Merge branch 'adoptium:master' into master
xius666 Sep 23, 2021
31739dc
change the common.xml
xius666 Sep 23, 2021
12d92e5
fix the then
xius666 Sep 23, 2021
b4a1347
change the to outputproperty in common.xm;
xius666 Sep 23, 2021
905cf8e
add the error msg
xius666 Sep 24, 2021
98df8fb
handle the case if branch not exit go to origin/branch
xius666 Sep 24, 2021
a61da47
solve the nested echo problem
xius666 Sep 24, 2021
8d1b115
remove the change relaed to #2882
xius666 Sep 28, 2021
ea7fdbc
move the if inside
xius666 Sep 28, 2021
b83463c
accept sha for openjdk_systemtest
xius666 Sep 28, 2021
4b78f22
accept sha for openj9-systemtest
xius666 Sep 28, 2021
0c46e74
Merge branch 'master' into issue_2887
xius666 Sep 28, 2021
bfca5c7
get rid of repetetive code for cloneing stf
xius666 Sep 29, 2021
2121589
fix the outputproperty unable to overwrite
xius666 Sep 29, 2021
3f7dec3
revert the change
xius666 Sep 29, 2021
8234885
fixfix the outputproperty unable to overwrite for systemtest
xius666 Sep 29, 2021
e8ccfda
Merge branch 'adoptium:master' into master
xius666 Sep 29, 2021
ad0f8ac
fix formatting
xius666 Sep 29, 2021
bea562a
change the logic for the openjdk system test
xius666 Oct 1, 2021
74fd2d0
Merge branch 'master' of https://github.com/xius666/aqa-tests into is…
xius666 Oct 1, 2021
bff81cf
Merge branch 'master' into issue_2887
xius666 Oct 1, 2021
c80a6e5
Merge branch 'issue_2887' of https://github.com/xius666/aqa-tests int…
xius666 Oct 1, 2021
c3fddbd
change logic for openj9-systemtest
xius666 Oct 1, 2021
583c5c8
fix no ending if
xius666 Oct 4, 2021
49aed88
fix failonerror
xius666 Oct 5, 2021
547d780
Merge branch 'master' into issue_2887
xius666 Oct 8, 2021
0bb19ea
fix the return
xius666 Oct 8, 2021
b7ae99d
change the name of sha
xius666 Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 97 additions & 21 deletions system/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
</then>
</if>
</target>

<target name="clone_stf">
<echo message="git clone -q ${stf_repo} "/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}">
Expand All @@ -62,7 +61,7 @@
<arg value="${stf_branch}"/>
</exec>
<if>
<equals arg1="${code}" arg2="128"/>
<equals arg1="${code}" arg2="128"/>
<then>
<echo message="git rev-parse origin/${stf_branch}"/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/stf" outputproperty="stf_sha2" resultproperty="code2">
Expand Down Expand Up @@ -98,12 +97,11 @@
<arg value="-f"/>
<arg value="${stf_sha}"/>
</exec>

<if>
<isset property="isZOS" />
<then>
<delete includeemptydirs="true" failonerror="false">
<fileset dir="${SYSTEMTEST_ROOT}/stf/.git/info" includes="**/*"/>
<fileset dir="${SYSTEMTEST_ROOT}/stf/.git/info" includes="**/*"/>
</delete>
<mkdir dir="${SYSTEMTEST_ROOT}/stf/.git/info" />
<move file="${SYSTEMTEST_ROOT}/stf/.gitattributes.zos" tofile="${SYSTEMTEST_ROOT}/stf/.git/info/attributes" />
Expand All @@ -122,18 +120,57 @@
</if>
<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/stf" />
</target>

<target name="clone_systemtest">
<echo message="Cloning from: ${openjdk_systemtest_repo} -b ${openjdk_systemtest_branch}"/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}">
<arg value="clone" />
<arg value="--depth" />
<arg value="1" />
<arg value="--single-branch" />
<arg value="-b"/>
<arg value="${openjdk_systemtest_branch}"/>
<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>

<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"/>
<arg value="${openjdk_systemtest_branch}"/>
</exec>
<if>
<equals arg1="${code}" arg2="128"/>
<then>
<echo message="git rev-parse origin/${openjdk_systemtest_branch}"/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/aqa-systemtest" outputproperty="openjdk_systemtest_sha2">
<arg value="rev-parse"/>
<arg value="origin/${openjdk_systemtest_branch}"/>
</exec>
<property name="openjdk_sha" value="${openjdk_systemtest_sha2}"/>
xius666 marked this conversation as resolved.
Show resolved Hide resolved
</then>
</if>
<if>
<not>
<isset property="openjdk_sha"/>
</not>
<then>
<property name="openjdk_sha" value="${openjdk_systemtest_sha1}"/>
</then>
</if>
<if>
<isset property="isZOS" />
<then>
<propertyregex
property="openjdk_sha"
input="${openjdk_sha}"
regexp="\n"
replace=""
override="true"/>
</then>
</if>
<echo message="git checkout -q -f ${openjdk_sha} "/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/aqa-systemtest" >
<arg value="checkout"/>
<arg value="-q"/>
<arg value="-f"/>
<arg value="${openjdk_sha}"/>
</exec>

<if>
<isset property="isZOS" />
<then>
Expand All @@ -159,15 +196,55 @@
</target>

<target name="clone_openj9-systemtest">
<echo message="Cloning from: ${openj9_systemtest_repo} -b ${openj9_systemtest_branch}"/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}">
<arg value="clone" />
<arg value="--depth" />
<arg value="1" />
<arg value="-b"/>
<arg value="${openj9_systemtest_branch}"/>
<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>
<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"/>
<arg value="${openj9_systemtest_branch}"/>
</exec>
<if>
<equals arg1="${code}" arg2="128"/>
<then>
<echo message="git rev-parse origin/${openj9_systemtest_branch}"/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/openj9-systemtest" outputproperty="openj9_systemtest_sha2">
<arg value="rev-parse"/>
<arg value="origin/${openj9_systemtest_branch}"/>
</exec>
<property name="openj9_sha" value="${openj9_systemtest_sha2}"/>
xius666 marked this conversation as resolved.
Show resolved Hide resolved
</then>
</if>
<if>
<not>
<isset property="openj9_sha"/>
</not>
<then>
<property name="openj9_sha" value="${openj9_systemtest_sha1}"/>
</then>
</if>
<if>
<isset property="isZOS" />
<then>
<propertyregex
property="openj9_sha"
input="${openj9_sha}"
regexp="\n"
replace=""
override="true"/>
</then>
</if>
<echo message="git checkout -q -f ${openj9_sha} "/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/openj9-systemtest" >
<arg value="checkout"/>
<arg value="-q"/>
<arg value="-f"/>
<arg value="${openj9_sha}"/>
</exec>

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


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