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

fix stf to STF #3038

Merged
merged 6 commits into from
Oct 27, 2021
Merged

fix stf to STF #3038

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fcfe4d8
fix STF
xius666 Oct 19, 2021
552b7ac
Merge branch 'master' into issue2949
xius666 Oct 19, 2021
bf4c375
system
sophia-guo Oct 20, 2021
7eec359
fix error
xius666 Oct 20, 2021
bf6a2a0
fix conflcit
xius666 Oct 20, 2021
fca6d08
Update buildenv/jenkins/JenkinsfileBase
xius666 Oct 21, 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
5 changes: 3 additions & 2 deletions buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,9 @@ def setup() {
env.OPENJ9_SYSTEMTEST_REPO = openj9SystemTest[0]
env.OPENJ9_SYSTEMTEST_BRANCH = openj9SystemTest[1]
}
if (!params.USE_TESTENV_PROPERTIES && params.STF_OWNER_BRANCH) {
String[] stf = getGitRepoBranch(params.STF_OWNER_BRANCH, "adoptium:master", "stf")

if (params.STF_OWNER_BRANCH) {
xius666 marked this conversation as resolved.
Show resolved Hide resolved
String[] stf = getGitRepoBranch(params.STF_OWNER_BRANCH, "adoptium:master", "STF")
env.STF_REPO = stf[0]
env.STF_BRANCH = stf[1]
}
Expand Down
30 changes: 15 additions & 15 deletions system/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
</exec>

<echo message="git rev-parse ${stf_branch} "/>
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/stf" outputproperty="stf_sha1" resultproperty="code">
<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}/STF" outputproperty="stf_sha1" resultproperty="code">
<arg value="rev-parse"/>
<arg value="${stf_branch}"/>
</exec>
<if>
<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">
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/STF" outputproperty="stf_sha2" resultproperty="code2">
<arg value="rev-parse"/>
<arg value="origin/${stf_branch}"/>
</exec>
Expand All @@ -91,7 +91,7 @@
</then>
</if>
<echo message="git checkout -q -f ${stf_sha} "/>
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/stf" >
<exec executable="git" failonerror="true" dir="${SYSTEMTEST_ROOT}/STF" >
<arg value="checkout"/>
<arg value="-q"/>
<arg value="-f"/>
Expand All @@ -101,24 +101,24 @@
<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" />
<exec executable="git" dir="${SYSTEMTEST_ROOT}/stf" failonerror="false">
<mkdir dir="${SYSTEMTEST_ROOT}/STF/.git/info" />
<move file="${SYSTEMTEST_ROOT}/STF/.gitattributes.zos" tofile="${SYSTEMTEST_ROOT}/STF/.git/info/attributes" />
<exec executable="git" dir="${SYSTEMTEST_ROOT}/STF" failonerror="false">
<arg value="rm" />
<arg value="--cached" />
<arg value="-r" />
<arg value="-q" />
<arg value="." />
</exec>
<exec executable="git" dir="${SYSTEMTEST_ROOT}/stf" failonerror="false">
<exec executable="git" dir="${SYSTEMTEST_ROOT}/STF" failonerror="false">
<arg value="reset" />
<arg value="--hard" />
</exec>
</then>
</if>
<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/stf" />
<checkGitRepoSha repoDir="${SYSTEMTEST_ROOT}/STF" />
</target>
<target name="clone_systemtest">
<echo message="git clone -q ${openjdk_systemtest_repo} "/>
Expand Down Expand Up @@ -272,14 +272,14 @@
<target name="check_systemtest" depends="common_init">
<if>
<not>
<available file="${SYSTEMTEST_ROOT}/stf" type="dir" />
<available file="${SYSTEMTEST_ROOT}/STF" type="dir" />
</not>
<then>
<echo message="${SYSTEMTEST_ROOT}/stf does not exist, clone from GitHub" />
<echo message="${SYSTEMTEST_ROOT}/STF does not exist, clone from GitHub" />
<antcall target="clone_stf" inheritall="true" />
</then>
<else>
<echo message="${SYSTEMTEST_ROOT}/stf exists, skip cloning" />
<echo message="${SYSTEMTEST_ROOT}/STF exists, skip cloning" />
</else>
</if>
<if>
Expand Down Expand Up @@ -332,8 +332,8 @@
</target>

<target name="common_dist" description="generate the distribution">
<copy todir="${SYSTEMTEST_DEST}/stf">
<fileset dir="${SYSTEMTEST_ROOT}/stf" includes="**" />
<copy todir="${SYSTEMTEST_DEST}/STF">
<fileset dir="${SYSTEMTEST_ROOT}/STF" includes="**" />
</copy>
<copy todir="${SYSTEMTEST_DEST}/aqa-systemtest" failonerror="false">
<fileset dir="${SYSTEMTEST_ROOT}/aqa-systemtest" includes="**" />
Expand Down Expand Up @@ -392,6 +392,6 @@
<ant antfile="${SYSTEMTEST_ROOT}/openj9-systemtest/openj9.build/build.xml" dir="${SYSTEMTEST_ROOT}/openj9-systemtest/openj9.build" inheritAll="false" target="clean"/>
</then>
</if>
<ant antfile="${SYSTEMTEST_ROOT}/stf/stf.build/build.xml" dir="${SYSTEMTEST_ROOT}/stf/stf.build" inheritAll="false" target="clean"/>
<ant antfile="${SYSTEMTEST_ROOT}/STF/stf.build/build.xml" dir="${SYSTEMTEST_ROOT}/STF/stf.build" inheritAll="false" target="clean"/>
</target>
</project>