Update the code for logic of USE_TESTENV_PROPERTIES

[sophia-guo]

Boolean parameter USE_TESTENV_PROPERTIES is used to decide use the environment variables defined in testenv.properties file or defined by user.

Currently the codes are scattered in different places, which make it hard to maintain and understand.

https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L32-L45 https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L401-L406 https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L425-L429 https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L419-L423 https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L413-L417

All those can be moved to one place https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L32-L45

As function getGitRepoBranch() requires the defaultOwnerBranch, the second condition is unnecessary. For example if(!params.USE_TESTENV_PROPERTIES && params.ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH) the condition params.ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH can just be removed.

[LizyBbethy]

i am up for this one

[smlambert]

@LizyBbethy - I've just assigned https://github.com/adoptium/aqa-tests/issues/3334 to you, so will leave this one unassigned for now.

[abhijeetjejurkar]

@sophia-guo I was unable to understand the Problem Correctly, Will you Please Help me Do we need to Replace

• !params.USE_TESTENV_PROPERTIES && params.ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH
• !params.USE_TESTENV_PROPERTIES && params.OPENJ9_SYSTEMTEST_OWNER_BRANCH
• !params.USE_TESTENV_PROPERTIES && params.STF_OWNER_BRANCH

with !params.USE_TESTENV_PROPERTIES in code

I am new to groovy But I can try if this is only thing to do. Please Guide me.

[sophia-guo]

@sophia-guo I was unable to understand the Problem Correctly, Will you Please Help me Do we need to Replace

!params.USE_TESTENV_PROPERTIES && params.ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH !params.USE_TESTENV_PROPERTIES && params.OPENJ9_SYSTEMTEST_OWNER_BRANCH !params.USE_TESTENV_PROPERTIES && params.STF_OWNER_BRANCH with !params.USE_TESTENV_PROPERTIES in code

Yes, @abhijeetjejurkar that is correct. And all three block can be combined to one !params.USE_TESTENV_PROPERTIES block.

[julian55455]

Hi @smlambert would like to take this issue

[zdtsw]

@julian55455 has this issue been accomplished?

[julian55455]

@zdtsw do you mean this https://github.com/adoptium/aqa-tests/pull/4023?

[zdtsw]

@zdtsw do you mean this #4023?

if #4023 is enough to close this issue, we should mark it as done.

[smlambert]

Closed via https://github.com/adoptium/aqa-tests/pull/4023