Fix stf sha issue

[xius666]

No description provided.

[llxia]

Instead of if, should this be else block? Also, I would like to have git checkout logic once.
pseudocode:

run git rev-parse ${stf_branch} // failonerror="false" and get stf_sha1
If code=128 {
    git rev-parse origin/${stf_branch} // set failonerror="true" and set stf_sha2
     if code2 =128 {
           // error. fail the build. if set failonerror="true" works as expected, we do not need this if block
      } else {
          // success. Set stf_sha
         <property stf_sha value="${stf_sha2}"/>
      }
}
if  stf_sha is not set {
      // set it to stf_sha1
      <property stf_sha value="${stf_sha1}"/>
}
run git checkout -q -f ${stf_sha}

[xius666]

I changed the logic according to the pseudocode, it is indeed a cleaner approach, and I also rerun on the grinder(1514,1515,1516).

[llxia]

Thanks a lot, @xius666 !

[llxia]

Grinder for the default case: https://ci.adoptopenjdk.net/view/Test_grinder/job/Grinder/1518/

[llxia]

One more thing, could you update to set failonerror="true" for git clone in the following line?

aqa-tests/system/common.xml

Line 53 in 182f216

<exec executable="git" failonerror="false" dir="${SYSTEMTEST_ROOT}">

If this fails, it means stf_repo is wrong. We should fail the build.

[xius666]

@llxia thanks for the suggestion, changed it pl review

[llxia]

LGTM

[LongyuZhang]

LGTM