From 9f9a8ae0056f62a5f770631bcaedcfde612d474b Mon Sep 17 00:00:00 2001 From: jandrlik Date: Wed, 7 Aug 2024 17:53:40 +0200 Subject: [PATCH 01/33] move JAVA_TO_TEST to the TKG settings.mk --- settings.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/settings.mk b/settings.mk index 4224a716..2251a4c9 100644 --- a/settings.mk +++ b/settings.mk @@ -168,6 +168,11 @@ ifdef JRE_IMAGE JRE_COMMAND:=$(Q)$(JRE_IMAGE)$(D)bin$(D)java$(Q) endif +JAVA_TO_TEST = $(JAVA_COMMAND) +ifeq ($(USE_JRE),1) + JAVA_TO_TEST = $(JRE_COMMAND) +endif + ####################################### # common dir and jars ####################################### From 0dfa1e74d61316e4a2203171bdd2c94241687b58 Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Thu, 5 Sep 2024 15:46:09 +0100 Subject: [PATCH 02/33] Fetch jars and shas from same location If we are getting our third party dependent shas from a custom URL, then the jars should also come from the same location. Signed-off-by: Adam Farley --- scripts/getDependencies.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl index 85528a2b..2f114eba 100644 --- a/scripts/getDependencies.pl +++ b/scripts/getDependencies.pl @@ -306,10 +306,10 @@ $url_custom .= "systemtest_prereqs/"; $url_custom .= $jars_info[$i]{dir}; $url_custom .= '/' unless $url_custom =~ /\/$/; - $url_custom .= $jars_info[$i]{fname}; - $url = "$url_custom"; } + $url = "$url_custom/$jars_info[$i]{fname}"; + if (defined $shaurl && $shaurl ne '') { $shaurl = "$url_custom/$shafn"; } From 87dbbb39c748a273938d9a6f403ebfc43d07e5a5 Mon Sep 17 00:00:00 2001 From: Zdenek Zambersky Date: Mon, 16 Sep 2024 15:58:11 +0200 Subject: [PATCH 03/33] Ignore variations when JVM_OPTIONS is set --- src/org/testKitGen/TestInfoParser.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/org/testKitGen/TestInfoParser.java b/src/org/testKitGen/TestInfoParser.java index 93eb652d..1f0fada9 100644 --- a/src/org/testKitGen/TestInfoParser.java +++ b/src/org/testKitGen/TestInfoParser.java @@ -147,12 +147,14 @@ public TestInfo parse() { getElements(ti.getPlatformRequirementsList(), "platformRequirementsList", "platformRequirements", null, ti.getTestCaseName()); List variations = new ArrayList(); - getElements(variations, "variations", "variation", null, ti.getTestCaseName()); List listOfVars = new ArrayList(); - for (int i = 0; i < variations.size(); i++) { - String subTestName = ti.getTestCaseName() + "_" + i; - Variation var = parseVariation(subTestName, variations.get(i), ti.getPlatform(), ti.getPlatformRequirementsList()); - listOfVars.add(var); + if (System.getenv("JVM_OPTIONS") == null) { + getElements(variations, "variations", "variation", null, ti.getTestCaseName()); + for (int i = 0; i < variations.size(); i++) { + String subTestName = ti.getTestCaseName() + "_" + i; + Variation var = parseVariation(subTestName, variations.get(i), ti.getPlatform(), ti.getPlatformRequirementsList()); + listOfVars.add(var); + } } if (variations.size() == 0) { String subTestName = ti.getTestCaseName() + "_0"; From 165d1b0ba8c852881f341bb8b21b996f33a7584d Mon Sep 17 00:00:00 2001 From: Zdenek Zambersky Date: Wed, 18 Sep 2024 13:22:27 +0200 Subject: [PATCH 04/33] print message when variations are ignored --- src/org/testKitGen/TestInfoParser.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/org/testKitGen/TestInfoParser.java b/src/org/testKitGen/TestInfoParser.java index 1f0fada9..6a4b9428 100644 --- a/src/org/testKitGen/TestInfoParser.java +++ b/src/org/testKitGen/TestInfoParser.java @@ -155,6 +155,8 @@ public TestInfo parse() { Variation var = parseVariation(subTestName, variations.get(i), ti.getPlatform(), ti.getPlatformRequirementsList()); listOfVars.add(var); } + } else { + System.out.println("Warning: JVM_OPTIONS specified, ignoring variations for " + testCaseName + "."); } if (variations.size() == 0) { String subTestName = ti.getTestCaseName() + "_0"; From 53ba0e329e3420f03cbd230681d37388a2cb7c71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:05:37 -0400 Subject: [PATCH 05/33] Bump github/codeql-action from 3.26.6 to 3.26.7 (#610) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.6 to 3.26.7. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4dd16135b69a43b6c8efb853346f8437d92d3c93...8214744c546c1e5c8f03dde8fab3a7353211988d) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 16d81dba..5da67a87 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6 + uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6 + uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6 + uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7 From 7a9badb2e925a8b7dbc765f57c243e803460ac11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:37:45 +0000 Subject: [PATCH 06/33] Bump github/codeql-action from 3.26.7 to 3.26.8 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.7 to 3.26.8. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/8214744c546c1e5c8f03dde8fab3a7353211988d...294a9d92911152fe08befb9ec03e240add280cb3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5da67a87..83d1e39e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7 + uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7 + uses: github/codeql-action/autobuild@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7 + uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8 From bbe8711e35192f943c552fc8d3b4f32c4b5f0f80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:41:16 -0400 Subject: [PATCH 07/33] Bump actions/setup-java from 4.2.2 to 4.3.0 (#607) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.2 to 4.3.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/6a0805fcefea3d4657a47ac4c165951e33482018...2dfa2011c5b2a0f1489bf9e433881c92c1631f88) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/testTKG.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml index d6f6142f..1b9f78e5 100644 --- a/.github/workflows/testTKG.yml +++ b/.github/workflows/testTKG.yml @@ -20,7 +20,7 @@ jobs: ref: refs/pull/${{ github.event.issue.number }}/head - name: Set up JDK - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0 with: distribution: 'temurin' java-version: 11 From ef79aaa549d9e8443a632503f36de0e4b1082d0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:25:07 +0000 Subject: [PATCH 08/33] Bump actions/setup-java from 4.3.0 to 4.4.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/2dfa2011c5b2a0f1489bf9e433881c92c1631f88...b36c23c0d998641eff861008f374ee103c25ac73) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/testTKG.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml index 1b9f78e5..2a16883e 100644 --- a/.github/workflows/testTKG.yml +++ b/.github/workflows/testTKG.yml @@ -20,7 +20,7 @@ jobs: ref: refs/pull/${{ github.event.issue.number }}/head - name: Set up JDK - uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0 + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: distribution: 'temurin' java-version: 11 From 095260432da5d1caf7b3bc1730a63eb4fe1cccae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:25:12 +0000 Subject: [PATCH 09/33] Bump github/codeql-action from 3.26.8 to 3.26.9 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.8 to 3.26.9. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/294a9d92911152fe08befb9ec03e240add280cb3...461ef6c76dfe95d5c364de2f431ddbd31a417628) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 83d1e39e..f1b4a6a0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8 + uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8 + uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8 + uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9 From 8733901e5c91a4fe49fcf2a15a710a6c516c9050 Mon Sep 17 00:00:00 2001 From: Anna Babu Palathingal <148897727+annaibm@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:45:01 -0400 Subject: [PATCH 10/33] Update feature flag handling for required features - Removed `null` statement from `required` feature check to ensure all required features are processed. - Allows the code to continue checking all feature flags, even after finding a required flag in `testFlags`. - Added test_not_arch_390_z15plus_0 into passed list for running TKG test PR in github actions as no microarch version is detected. related:https://github.ibm.com/runtimes/backlog/issues/1525 Signed-off-by: Anna Babu Palathingal --- scripts/testTKG/test_platformRequirements.py | 1 + src/org/testKitGen/TestInfoParser.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/testTKG/test_platformRequirements.py b/scripts/testTKG/test_platformRequirements.py index a41d4c5b..dd10f6b8 100644 --- a/scripts/testTKG/test_platformRequirements.py +++ b/scripts/testTKG/test_platformRequirements.py @@ -149,6 +149,7 @@ def run_test(): skipped.add('test_not_arch_390_0') else: passed.add('test_not_arch_390_0') + passed.add('test_not_arch_390_z15plus_0') if 'test_arch_390_z15_0' not in passed: skipped.add('test_arch_390_z15_0') diff --git a/src/org/testKitGen/TestInfoParser.java b/src/org/testKitGen/TestInfoParser.java index 6a4b9428..f9c6a3ae 100644 --- a/src/org/testKitGen/TestInfoParser.java +++ b/src/org/testKitGen/TestInfoParser.java @@ -88,11 +88,15 @@ public TestInfo parse() { ti.addFeature(featElements[0].toLowerCase(), featElements[1].toLowerCase()); } Set testFlags = new HashSet<>(arg.getTestFlag()); + boolean requiredFeatureFound = false; + boolean hasRequiredFeature = false; for (Map.Entry entry : ti.getFeatures().entrySet()) { String featureOpt = entry.getValue().toLowerCase(); if (featureOpt.equals("required")) { - if (!isFeatureInTestFlags(testFlags, entry.getKey())) { - return null; + hasRequiredFeature = true; + if (isFeatureInTestFlags(testFlags, entry.getKey())) { + requiredFeatureFound = true; + break; } } else if (featureOpt.equals("nonapplicable")) { // Do not generate make target if the test is not applicable for one feature defined in TEST_FLAG @@ -106,7 +110,9 @@ public TestInfo parse() { System.exit(1); } } - + if (hasRequiredFeature && !requiredFeatureFound) { + return null; + } if (testFlags.contains("aot")) { for (Map.Entry entry : ti.getFeatures().entrySet()) { if (doesFeatureMatchTestFlag("aot", entry.getKey())) { From d87edca3b9578ebc2a91ae656b397a61da5a744a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:34:11 -0400 Subject: [PATCH 11/33] Bump actions/checkout from 4.1.7 to 4.2.0 (#617) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/runAqa.yml | 4 ++-- .github/workflows/testTKG.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f1b4a6a0..8a11a15e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml index d22763ff..1da45103 100644 --- a/.github/workflows/runAqa.yml +++ b/.github/workflows/runAqa.yml @@ -19,7 +19,7 @@ jobs: id: workflow_run_info # Checkout current (TKG) repo to access the repo-specific config file `.github/workflows/runAqaConfig.json` and the shared script `scripts/testRepo/runAqaArgParse.py` - name: Checkout current repo - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: path: 'main' - name: Parse parameters @@ -107,7 +107,7 @@ jobs: sourceType: 'buildType' impl: ${{ matrix.jdk_impl }} - name: Checkout PR Ref - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 if: matrix.sdk_resource == 'build-jdk' with: repository: ${{ matrix.build_repo_branch.repo }} diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml index 2a16883e..42d76e41 100644 --- a/.github/workflows/testTKG.yml +++ b/.github/workflows/testTKG.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: startsWith(github.event.comment.body, 'run tkg-test') steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: ref: refs/pull/${{ github.event.issue.number }}/head From 08d54b8842fd3d767582ec11d6eea55bda01922e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:11:04 +0000 Subject: [PATCH 12/33] Bump github/codeql-action from 3.26.9 to 3.26.10 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.9 to 3.26.10. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/461ef6c76dfe95d5c364de2f431ddbd31a417628...e2b3eafc8d227b0241d48be5f425d47c2d750a13) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8a11a15e..1021486d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9 + uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9 + uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9 + uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10 From a3ca9793f49ffec7c3ff8212c84f8127c15058e9 Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Mon, 23 Sep 2024 16:09:06 -0400 Subject: [PATCH 13/33] Add FIPS_VARIATION_PROBLEM_LIST_FILE support related: backlog/issues/1529 and https://github.com/adoptium/aqa-tests/pull/5662 Signed-off-by: Lan Xia --- src/org/testKitGen/MkGen.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/org/testKitGen/MkGen.java b/src/org/testKitGen/MkGen.java index 15ed029c..6b4fd335 100644 --- a/src/org/testKitGen/MkGen.java +++ b/src/org/testKitGen/MkGen.java @@ -96,7 +96,24 @@ private void writeSingleTest(List testsInPlaylist, TestInfo testInfo, Fi f.write(testTargetName + ": TEST_GROUP=" + testInfo.getLevelStr() + "\n"); f.write(testTargetName + ": TEST_ITERATIONS=" + testInfo.getIterations() + "\n"); f.write(testTargetName + ": AOT_ITERATIONS=" + testInfo.getAotIterations() + "\n"); - + + // Set special openjdk problem list for JVM options that contains FIPS profile + // This feature is ignored if TEST_FLAG contains FIPS + if (arg.getBuildList().contains("openjdk")) { + String jvmOpts = var.getJvmOptions(); + String customprofileStr = "-Dsemeru.customprofile="; + if (!arg.getTestFlag().contains("FIPS") && !jvmOpts.isEmpty() && jvmOpts.contains(customprofileStr)) { + String[] splited = jvmOpts.split("\\s+"); + for (int i = 0; i < splited.length; i++) { + if (splited[i].contains(customprofileStr)) { + String fipsProfile = splited[i].replace(customprofileStr, "").trim(); + f.write(testTargetName + ": FIPS_VARIATION_PROBLEM_LIST_FILE=-exclude:$(Q)$(JTREG_JDK_TEST_DIR)/ProblemList-" + fipsProfile + ".txt$(Q)\n"); + break; + } + } + } + } + f.write(testTargetName + ":\n"); f.write(indent + "@echo \"\" | tee -a $(Q)$(TESTOUTPUT)$(D)TestTargetResult$(Q);\n"); f.write(indent From 3e1e4a913329a551a4ca082261ff08f9cb3c597b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 18:07:24 +0000 Subject: [PATCH 14/33] Bump github/codeql-action from 3.26.10 to 3.26.13 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.10 to 3.26.13. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/e2b3eafc8d227b0241d48be5f425d47c2d750a13...f779452ac5af1c261dce0346a8f964149f49322b) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1021486d..4a906274 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10 + uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10 + uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10 + uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 From e58a63fbfb5d363105e076bb060f2070971c1e26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 09:58:09 -0400 Subject: [PATCH 15/33] Bump actions/checkout from 4.2.0 to 4.2.1 (#622) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/d632683dd7b4114ad314bca15554477dd762a938...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/runAqa.yml | 4 ++-- .github/workflows/testTKG.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4a906274..918eb60e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml index 1da45103..ccd42f24 100644 --- a/.github/workflows/runAqa.yml +++ b/.github/workflows/runAqa.yml @@ -19,7 +19,7 @@ jobs: id: workflow_run_info # Checkout current (TKG) repo to access the repo-specific config file `.github/workflows/runAqaConfig.json` and the shared script `scripts/testRepo/runAqaArgParse.py` - name: Checkout current repo - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: path: 'main' - name: Parse parameters @@ -107,7 +107,7 @@ jobs: sourceType: 'buildType' impl: ${{ matrix.jdk_impl }} - name: Checkout PR Ref - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 if: matrix.sdk_resource == 'build-jdk' with: repository: ${{ matrix.build_repo_branch.repo }} diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml index 42d76e41..5dfd5930 100644 --- a/.github/workflows/testTKG.yml +++ b/.github/workflows/testTKG.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: startsWith(github.event.comment.body, 'run tkg-test') steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: ref: refs/pull/${{ github.event.issue.number }}/head From 582abb03801cb77f1a1b8c7d240332af44f5041b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 09:58:25 -0400 Subject: [PATCH 16/33] Bump actions/upload-artifact from 4.4.0 to 4.4.3 (#626) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/runAqa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml index ccd42f24..a82847b6 100644 --- a/.github/workflows/runAqa.yml +++ b/.github/workflows/runAqa.yml @@ -168,7 +168,7 @@ jobs: openjdk_testRepo: ${{ matrix.openjdk_testrepo }} openj9_repo: ${{ matrix.openj9_repo }} tkg_Repo: '${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}:${{ fromJSON(steps.get-pr.outputs.result).head.ref }}' - - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 if: failure() with: name: test_output From 74da2fd3c5cc852a8d205ac1edb68d6e480c5c41 Mon Sep 17 00:00:00 2001 From: Theresa Mammarella Date: Wed, 16 Oct 2024 10:00:05 -0400 Subject: [PATCH 17/33] Remove outdated value types issue comment (#628) Signed-off-by: Theresa Mammarella --- settings.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/settings.mk b/settings.mk index 2251a4c9..268db9f6 100644 --- a/settings.mk +++ b/settings.mk @@ -419,7 +419,6 @@ OPENDJK_METHODHANDLES_ENABLED?=$(shell $(JAVA_COMMAND) -XshowSettings:properties ifneq (,$(findstring true,$(OPENDJK_METHODHANDLES_ENABLED))) export EXCLUDE_FILE:=$(EXCLUDE_FILE),$(TEST_ROOT)$(D)TestConfig$(D)resources$(D)excludes$(D)feature_ojdkmh_exclude.txt endif -# Issue to track excluded tests in x86-64_linux_vt_standard build: https://github.com/eclipse-openj9/openj9/issues/12878 VALUE_TYPE_STANDARD_BUILD?=$(shell $(JAVA_COMMAND) -version 2>&1 | grep 'vtstandard') ifneq (,$(findstring vtstandard,$(VALUE_TYPE_STANDARD_BUILD))) export EXCLUDE_FILE:=$(EXCLUDE_FILE),$(TEST_ROOT)$(D)TestConfig$(D)resources$(D)excludes$(D)feature_vtstandard_exclude.txt From 14a20a101025f16ffe267e851c13bdb412140651 Mon Sep 17 00:00:00 2001 From: Theresa Mammarella Date: Tue, 22 Oct 2024 14:10:55 -0400 Subject: [PATCH 18/33] Update ByteBuddy and ByteBuddyAgent to 1.15.4 Signed-off-by: Theresa Mammarella --- scripts/getDependencies.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl index 2f114eba..f501a622 100644 --- a/scripts/getDependencies.pl +++ b/scripts/getDependencies.pl @@ -75,14 +75,14 @@ sha1 => 'a0f58cad836a410f6ba133aaa209aea7e54aaf8a' }, byte_buddy => { - url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar', + url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.15.4/byte-buddy-1.15.4.jar', fname => 'byte-buddy.jar', - sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1' + sha1 => 'e8bd42992701720649765383ff570f415190b83f' }, byte_buddy_agent => { - url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.12/byte-buddy-agent-1.14.12.jar', + url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.4/byte-buddy-agent-1.15.4.jar', fname => 'byte-buddy-agent.jar', - sha1 => 'be4984cb6fd1ef1d11f218a648889dfda44b8a15' + sha1 => '58e850dde88f3cf20f41f659440bef33f6c4fe02' }, objenesis => { url => 'https://repo1.maven.org/maven2/org/objenesis/objenesis/3.3/objenesis-3.3.jar', From 0f9799a4cc2c25db883a07b215593e0fcace4ca0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 18:42:06 +0000 Subject: [PATCH 19/33] Bump actions/setup-java from 4.4.0 to 4.5.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/b36c23c0d998641eff861008f374ee103c25ac73...8df1039502a15bceb9433410b1a100fbe190c53b) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/testTKG.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml index 5dfd5930..ab443485 100644 --- a/.github/workflows/testTKG.yml +++ b/.github/workflows/testTKG.yml @@ -20,7 +20,7 @@ jobs: ref: refs/pull/${{ github.event.issue.number }}/head - name: Set up JDK - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 + uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 with: distribution: 'temurin' java-version: 11 From ee9d87f21ce4cc706abb714c325b4484d437622a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:15:48 -0400 Subject: [PATCH 20/33] Bump actions/checkout from 4.2.1 to 4.2.2 (#631) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/runAqa.yml | 4 ++-- .github/workflows/testTKG.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 918eb60e..9c669cee 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml index a82847b6..3ad14a79 100644 --- a/.github/workflows/runAqa.yml +++ b/.github/workflows/runAqa.yml @@ -19,7 +19,7 @@ jobs: id: workflow_run_info # Checkout current (TKG) repo to access the repo-specific config file `.github/workflows/runAqaConfig.json` and the shared script `scripts/testRepo/runAqaArgParse.py` - name: Checkout current repo - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: path: 'main' - name: Parse parameters @@ -107,7 +107,7 @@ jobs: sourceType: 'buildType' impl: ${{ matrix.jdk_impl }} - name: Checkout PR Ref - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 if: matrix.sdk_resource == 'build-jdk' with: repository: ${{ matrix.build_repo_branch.repo }} diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml index 5dfd5930..fdfce720 100644 --- a/.github/workflows/testTKG.yml +++ b/.github/workflows/testTKG.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: startsWith(github.event.comment.body, 'run tkg-test') steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: refs/pull/${{ github.event.issue.number }}/head From a7d061d3a75ad9c6513083d0e8d71980319fa936 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:16:03 -0400 Subject: [PATCH 21/33] Bump github/codeql-action from 3.26.13 to 3.27.0 (#630) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.13 to 3.27.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f779452ac5af1c261dce0346a8f964149f49322b...662472033e021d55d94146f66f6058822b0b39fd) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9c669cee..b74d7c99 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 + uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 + uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13 + uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 From 39aa14a48bd584f22bcc3141f30c8b8a0868143d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:37:58 +0000 Subject: [PATCH 22/33] Bump github/codeql-action from 3.27.0 to 3.27.4 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.0 to 3.27.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/662472033e021d55d94146f66f6058822b0b39fd...ea9e4e37992a54ee68a9622e985e60c8e8f12d9f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b74d7c99..43c6bde2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 + uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 + uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 + uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 From e7f48d10aa255f177bb8997c0a70c24b69d029ee Mon Sep 17 00:00:00 2001 From: Anna Babu Palathingal <148897727+annaibm@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:40:44 -0400 Subject: [PATCH 23/33] Remove tools.jar dependency - Remove the download of tools.jar into testDependency dir in the system - The tools.jar locaton is updated to be taken from java.home lib in STF related: eclipse-openj9/openj9#19888 Signed-off-by: Anna Babu Palathingal --- scripts/getDependencies.pl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl index f501a622..b4b28b2c 100644 --- a/scripts/getDependencies.pl +++ b/scripts/getDependencies.pl @@ -248,12 +248,6 @@ dir => 'mauve', fname => 'mauve.jar', is_system_test => 1 - }, - tools => { - url => 'https://ci.adoptium.net/job/systemtest.getDependency/lastSuccessfulBuild/artifact/systemtest_prereqs/tools/tools.jar', - dir => 'tools', - fname => 'tools.jar', - is_system_test => 1 }); my %jars_to_use; From 9a8f750f9965fae95dca1476756c0ed09a9ad8a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:08:09 +0000 Subject: [PATCH 24/33] Bump github/codeql-action from 3.27.4 to 3.27.5 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.4 to 3.27.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ea9e4e37992a54ee68a9622e985e60c8e8f12d9f...f09c1c0a94de965c15400f5634aa42fac8fb8f88) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 43c6bde2..084d0ced 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 From 3a3a46b7d37c9aabd9468d232e884c114bd6ccec Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Fri, 22 Nov 2024 10:05:50 -0500 Subject: [PATCH 25/33] Revert "Remove tools.jar dependency from TKG" --- scripts/getDependencies.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl index b4b28b2c..f501a622 100644 --- a/scripts/getDependencies.pl +++ b/scripts/getDependencies.pl @@ -248,6 +248,12 @@ dir => 'mauve', fname => 'mauve.jar', is_system_test => 1 + }, + tools => { + url => 'https://ci.adoptium.net/job/systemtest.getDependency/lastSuccessfulBuild/artifact/systemtest_prereqs/tools/tools.jar', + dir => 'tools', + fname => 'tools.jar', + is_system_test => 1 }); my %jars_to_use; From 7d92077a6ba0757711a32b37dbaeba01e2707a5a Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Tue, 26 Nov 2024 17:13:03 -0500 Subject: [PATCH 26/33] checking if JVM_OPTIONS is empty --- src/org/testKitGen/TestInfoParser.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/testKitGen/TestInfoParser.java b/src/org/testKitGen/TestInfoParser.java index f9c6a3ae..01eeaf03 100644 --- a/src/org/testKitGen/TestInfoParser.java +++ b/src/org/testKitGen/TestInfoParser.java @@ -154,7 +154,8 @@ public TestInfo parse() { List variations = new ArrayList(); List listOfVars = new ArrayList(); - if (System.getenv("JVM_OPTIONS") == null) { + String jvmOptions = System.getenv("JVM_OPTIONS"); + if (jvmOptions == null || jvmOptions.isEmpty()) { getElements(variations, "variations", "variation", null, ti.getTestCaseName()); for (int i = 0; i < variations.size(); i++) { String subTestName = ti.getTestCaseName() + "_" + i; From 616d91a0ee2d9abe53cffe17bbffa0d9a05eabaf Mon Sep 17 00:00:00 2001 From: sophia-guo Date: Wed, 27 Nov 2024 15:00:41 -0500 Subject: [PATCH 27/33] Enhance the check of envTf variable (#642) Signed-off-by: Sophia Guo --- src/org/openj9/envInfo/JavaInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/openj9/envInfo/JavaInfo.java b/src/org/openj9/envInfo/JavaInfo.java index 46242d7f..7dea134c 100644 --- a/src/org/openj9/envInfo/JavaInfo.java +++ b/src/org/openj9/envInfo/JavaInfo.java @@ -259,7 +259,7 @@ public String getTestFlag() { checkJFR(); String envTf = System.getenv("TEST_FLAG"); String paddedTf = null; - if (envTf != null) { + if (envTf != null && !envTf.isEmpty()) { testFlag = envTf; paddedTf = "," + envTf + ","; } From 736a6c96b876b9f7856ba1a891300bbcc668f261 Mon Sep 17 00:00:00 2001 From: IamLRBA Date: Fri, 29 Nov 2024 03:03:06 +0300 Subject: [PATCH 28/33] Removed view/Dependencies from asmtools URL --- scripts/getDependencies.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl index f501a622..0db31872 100644 --- a/scripts/getDependencies.pl +++ b/scripts/getDependencies.pl @@ -125,9 +125,9 @@ sha1 => 'bfcb96281ea3b59d626704f74bc6d625ff51cbce' }, asmtools => { - url => 'https://ci.adoptium.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/asmtools/asmtools-core-7.0.b10-ea.jar', + url => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/asmtools/asmtools-core-7.0.b10-ea.jar', fname => 'asmtools.jar', - shaurl => 'https://ci.adoptium.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/asmtools/asmtools-core-7.0.b10-ea.jar.sha256sum.txt', + shaurl => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/asmtools/asmtools-core-7.0.b10-ea.jar.sha256sum.txt', shafn => 'asmtools.jar.sha256sum.txt', shaalg => '256' }, From b936213287057a869e5611928cba71089787f0a0 Mon Sep 17 00:00:00 2001 From: Pasam Soujanya Date: Mon, 2 Dec 2024 16:23:02 +0530 Subject: [PATCH 29/33] Use jtreg6.1 for JDK11/17 on z/OS Signed-off-by: Pasam Soujanya --- scripts/getDependencies.pl | 7 +++++++ scripts/getDependencies.xml | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl index 0db31872..ecc2a730 100644 --- a/scripts/getDependencies.pl +++ b/scripts/getDependencies.pl @@ -167,6 +167,13 @@ shafn => 'jtreg_7_3_1_1.tar.gz.sha256sum.txt', shaalg => '256' }, + jtreg_6_1 => { + url => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtreg-6+1.tar.gz', + fname => 'jtreg_6_1.tar.gz', + shaurl => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtreg-6+1.tar.gz.sha256sum.txt', + shafn => 'jtreg_6_1.tar.gz.sha256sum.txt', + shaalg => '256' + }, jtreg_7_4_1 => { url => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtreg-7.4+1.tar.gz', fname => 'jtreg_7_4_1.tar.gz', diff --git a/scripts/getDependencies.xml b/scripts/getDependencies.xml index 205ae7e7..16f126bc 100644 --- a/scripts/getDependencies.xml +++ b/scripts/getDependencies.xml @@ -21,12 +21,25 @@ + + + + + + + + + + + + + @@ -39,6 +52,7 @@ + From b8745586119fc84b8cae5bb6ff4a0926ad31960d Mon Sep 17 00:00:00 2001 From: Shelley Lambert Date: Mon, 2 Dec 2024 23:27:28 -0500 Subject: [PATCH 30/33] Replace Win delimiters Signed-off-by: Shelley Lambert --- scripts/resultsSum.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl index 92bd95cf..04804d87 100755 --- a/scripts/resultsSum.pl +++ b/scripts/resultsSum.pl @@ -351,6 +351,7 @@ sub resultReporter { my $timeStamp = gmtime(); #add AQACert.log content in TAP file + $tapPath =~ s[\\][/]g; my $AQACert = $tapPath."../AQACert.log"; my $AQACertContent = `cat $AQACert`; $AQACertContent =~ s/\n/\n# /g; From 0577a7f221078c95c0b658c6087624df571acc26 Mon Sep 17 00:00:00 2001 From: Pasam Soujanya Date: Tue, 3 Dec 2024 12:12:22 +0530 Subject: [PATCH 31/33] Use jtreg6.1 for 11/17 on z/OS --- scripts/getDependencies.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/getDependencies.xml b/scripts/getDependencies.xml index 16f126bc..8ca2da9d 100644 --- a/scripts/getDependencies.xml +++ b/scripts/getDependencies.xml @@ -34,7 +34,10 @@ - + From fed8361a7cddeca3c661737c81daf6b5f3b852d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 18:18:38 +0000 Subject: [PATCH 32/33] Bump github/codeql-action from 3.27.5 to 3.27.6 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.5 to 3.27.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f09c1c0a94de965c15400f5634aa42fac8fb8f88...aa578102511db1f4524ed59b8cc2bae4f6e88195) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 084d0ced..5179002e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 + uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 + uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 + uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6 From c01e1f40f58e7fd339e298ea58e145a630aa54fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 18:33:06 +0000 Subject: [PATCH 33/33] Bump github/codeql-action from 3.27.6 to 3.27.7 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.6 to 3.27.7. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/aa578102511db1f4524ed59b8cc2bae4f6e88195...babb554ede22fd5605947329c4d04d8e7a0b8155) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5179002e..1bf2df31 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6 + uses: github/codeql-action/init@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -57,7 +57,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6 + uses: github/codeql-action/autobuild@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6 + uses: github/codeql-action/analyze@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7