Support OPENJCEPLUS_GIT_REPO and OPENJCEPLUS_GIT_BRANCH in testenv.properties

[llxia]

• create testenvSettings.sh for testenv variable settings
• export OPENJCEPLUS_GIT_REPO and OPENJCEPLUS_GIT_BRANCH values in testenvSettings.sh
• update functional/OpenJcePlusTests/build.xml to handle branch/tag/sha values
• add JDKXXX_OPENJCEPLUS_GIT_REPO and JDKXXX_OPENJCEPLUS_GIT_BRANCH in testenv.properties
• when DYNAMIC_COMPILE=true, we will run make <test> command directly (compile.sh will be skipped)
  To fix openjdk repo and branch are not based on testenv.properties values when DYNAMIC_COMPILE is enabled #4509, testenvSettings.sh needs to run before make <test> command

resolves: #5290 and #4509

[llxia]

• JDK11_OPENJCEPLUS_GIT_BRANCH=1afb341176257c109b65b4151159e0838d1e2fbe in testenv.properties file and set USE_TESTENV_PROPERTIES=true, DYNAMIC_COMPILE=true: Grinder

00:10:56.326  JDK8_OPENJCEPLUS_GIT_REPO=https://github.com/ibmruntimes/OpenJCEPlus.git
00:10:56.326  JDK8_OPENJCEPLUS_GIT_BRANCH=semeru-java8
00:10:56.326  JDK11_OPENJCEPLUS_GIT_REPO=https://github.com/ibmruntimes/OpenJCEPlus.git
00:10:56.326  JDK11_OPENJCEPLUS_GIT_BRANCH=1afb341176257c109b65b4151159e0838d1e2fbe <== SHA is used
00:10:56.326  JDK17_OPENJCEPLUS_GIT_REPO=https://github.com/ibmruntimes/OpenJCEPlus.git
00:10:56.326  JDK17_OPENJCEPLUS_GIT_BRANCH=semeru-java17
00:10:56.326  JDK21_OPENJCEPLUS_GIT_REPO=https://github.com/ibmruntimes/OpenJCEPlus.git
00:10:56.326  JDK21_OPENJCEPLUS_GIT_BRANCH=semeru-java21
00:10:56.326  JDK22_OPENJCEPLUS_GIT_REPO=https://github.com/ibmruntimes/OpenJCEPlus.git
00:10:56.326  JDK22_OPENJCEPLUS_GIT_BRANCH=semeru-java22

00:11:05.527  getOpenJcePlusTests:
00:11:05.527       [exec] git clone -q https://github.com/ibmruntimes/OpenJCEPlus.git OpenJCEPlus
00:11:08.259       [echo] git rev-parse 1afb341176257c109b65b4151159e0838d1e2fbe 
00:11:08.259       [echo] git checkout -q -f 1afb341176257c109b65b4151159e0838d1e2fbe 
00:11:08.259       [exec] Check sha in OpenJCEPlus and store the info in /home/jenkins/workspace/Grinder/aqa-tests/TKG/../TKG/SHA.txt
00:11:08.259       [exec] ================================================
00:11:08.259       [exec] timestamp: 20240507-105353
00:11:08.259       [exec] repo dir: OpenJCEPlus
00:11:08.259       [exec] git repo: 
00:11:08.259       [exec]   Fetch URL: https://github.com/ibmruntimes/OpenJCEPlus.git
00:11:08.259       [exec] sha:
00:11:08.259       [exec] 1afb341176257c109b65b4151159e0838d1e2fbe
00:11:08.259       [exec] USE_TESTENV_PROPERTIES was set, not writing to testenv.properties
00:11:08.259     [delete] Deleting directory /home/jenkins/workspace/Grinder/aqa-tests/functional/OpenJcePlusTests/OpenJCEPlus/src/main

• JDK11_OPENJCEPLUS_GIT_BRANCH=1afb341176257c109b65b4151159e0838d1e2fbe in testenv.properties file and set USE_TESTENV_PROPERTIES=true, DYNAMIC_COMPILE=false: Grinder
• JDK11_OPENJCEPLUS_GIT_BRANCH=1afb341176257c109b65b4151159e0838d1e2fbe in testenv.properties file and set USE_TESTENV_PROPERTIES=true, DYNAMIC_COMPILE=true, PARALLEL=Dynamic: Grinder
• jdk_math: Grinder
• MiniMix_5m: Grinder

00:01:19.242  STF_REPO=https://github.com/adoptium/STF.git
00:01:19.242  STF_BRANCH=v1.0.1

00:01:31.587  clone_stf:
00:01:31.587       [exec] git clone -q https://github.com/adoptium/STF.git
00:01:32.989       [echo] git rev-parse v1.0.1 
00:01:32.989       [echo] git checkout -q -f 2392368cc65dc7343374438c6b640881a98e430f 
00:01:32.989       [exec] Check sha in /home/jenkins/workspace/Grinder/aqa-tests/TKG/../system/STF and store the info in /home/jenkins/workspace/Grinder/aqa-tests/TKG/../TKG/SHA.txt
00:01:32.989       [exec] ================================================
00:01:32.989       [exec] timestamp: 20240507-125845
00:01:32.989       [exec] repo dir: /home/jenkins/workspace/Grinder/aqa-tests/TKG/../system/STF
00:01:32.989       [exec] git repo: 
00:01:32.989       [exec]   Fetch URL: https://github.com/adoptium/STF.git
00:01:32.989       [exec] sha:
00:01:32.989       [exec] 89020fe1391aecaa6d2cf4f5402b60d200705c2a

• set USE_TESTENV_PROPERTIES=false, DYNAMIC_COMPILE=true (default value semeru-java11 is used): Grinder ===> Grinder failed due to dependency missing. Not related to this PR.

00:01:32.978  getOpenJcePlusTests:
00:01:32.978       [exec] git clone -q https://github.com/ibmruntimes/OpenJCEPlus.git OpenJCEPlus
00:01:34.742       [echo] git rev-parse semeru-java11 
00:01:34.742       [exec] Result: 128
00:01:34.742       [echo] git rev-parse origin/semeru-java11
00:01:34.742       [echo] git checkout -q -f 5f0fd1989ad89e4ae32a33d63bfc47ec7c75a90c 
00:01:34.742       [exec] Check sha in OpenJCEPlus and store the info in /home/jenkins/workspace/Grinder/aqa-tests/TKG/../TKG/SHA.txt
00:01:34.742       [exec] ================================================
00:01:34.742       [exec] timestamp: 20240507-190357
00:01:34.742       [exec] repo dir: OpenJCEPlus
00:01:34.742       [exec] git repo: 
00:01:34.742       [exec]   Fetch URL: https://github.com/ibmruntimes/OpenJCEPlus.git
00:01:34.742       [exec] sha:
00:01:34.742       [exec] 5f0fd1989ad89e4ae32a33d63bfc47ec7c75a90c

[smlambert]

I'd like to keep newly added scripts organized into the scripts folder. I haven't looked closely at this PR yet, but wanted to let you know about the existence https://github.com/adoptium/aqa-tests/tree/master/scripts/testenv and that I think testenvSettings.sh should live there.

We should also test how this change impacts the functionality that was added in https://github.com/adoptium/aqa-tests/blob/master/scripts/testenv/checkTags.sh

[llxia]

wanted to let you know about the existence https://github.com/adoptium/aqa-tests/tree/master/scripts/testenv and that I think testenvSettings.sh should live there.

I will move testenvSettings.sh under the folder

We should also test how this change impacts the functionality that was added in https://github.com/adoptium/aqa-tests/blob/master/scripts/testenv/checkTags.sh

I moved the content from compile.sh into testenvSettings.sh and added OPENJCEPLUS changes. Since testenvSettings.sh is used in multiple places (i.e., compile.sh, before make <test> , potentially in get.sh in the future), it should be a separate script for common use.

This PR should not impact https://github.com/adoptium/aqa-tests/blob/master/scripts/testenv/checkTags.sh because checkTags.sh gets triggered in https://github.com/adoptium/aqa-tests/blob/master/get.sh#L780, which is before compilation and test run. testenvSettings.sh exports the values in testenv.prtoperties.

Also, since checkTags.sh gets triggered when USE_TESTENV_PROPERTIES=true, it got triggered via the above test runs.

00:00:27.005  Running checkTags with ./testenv/testenv.properties and 11
00:00:28.433  Use branch name dev from ./testenv/testenv.properties

However, if you have a better way of testing it, please let me know.

[smlambert]

However, if you have a better way of testing it, please let me know.

I just wanted to check that things still get called. Since checkTags only refers to the JDK_BRANCH, there is nothing to add there to support the OPENJCEPLUS tags.

Thanks @llxia !

[llxia]

reran with folder change (done):

• jdk_math: Grinder
• jdk_math windows USE_TESTENV_PROPERTIES=true, DYNAMIC_COMPILE=false : Grinder
• floatSanityTests windows USE_TESTENV_PROPERTIES=true, DYNAMIC_COMPILE=true: Grinder
• openJcePlusTests USE_TESTENV_PROPERTIES=true, DYNAMIC_COMPILE=true: Grinder ===> Grinder failed due to dependency missing. Not related to this PR.

00:01:12.373  getOpenJcePlusTests:
00:01:12.373       [exec] git clone -q https://github.com/ibmruntimes/OpenJCEPlus.git OpenJCEPlus
00:01:13.224       [echo] git rev-parse semeru-java11 
00:01:13.224       [exec] Result: 128
00:01:13.224       [echo] git rev-parse origin/semeru-java11
00:01:13.224       [echo] git checkout -q -f 5f0fd1989ad89e4ae32a33d63bfc47ec7c75a90c 
00:01:13.224       [exec] Check sha in OpenJCEPlus and store the info in /home/jenkins/workspace/Grinder/aqa-tests/TKG/../TKG/SHA.txt
00:01:13.224       [exec] ================================================
00:01:13.224       [exec] timestamp: 20240508-110628
00:01:13.224       [exec] repo dir: OpenJCEPlus
00:01:13.224       [exec] git repo: 
00:01:13.224       [exec]   Fetch URL: https://github.com/ibmruntimes/OpenJCEPlus.git
00:01:13.224       [exec] sha:
00:01:13.224       [exec] 5f0fd1989ad89e4ae32a33d63bfc47ec7c75a90c

• openJcePlusTests USE_TESTENV_PROPERTIES=true, DYNAMIC_COMPILE=false: Grinder ===> Grinder failed due to dependency missing. Not related to this PR.

PR is ready to merge.

[LongyuZhang]

LGTM