From 7f2a3f9a1e886b6c13d8dd9e75988f80646124fc Mon Sep 17 00:00:00 2001
From: Shelley Lambert <slambert@gmail.com>
Date: Tue, 20 Feb 2024 14:31:00 -0500
Subject: [PATCH 01/45] Add Fujitsu (#501)

Signed-off-by: Shelley Lambert <slambert@gmail.com>
---
 src/org/openj9/envInfo/JavaInfo.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/org/openj9/envInfo/JavaInfo.java b/src/org/openj9/envInfo/JavaInfo.java
index 12c8296d..7091543f 100644
--- a/src/org/openj9/envInfo/JavaInfo.java
+++ b/src/org/openj9/envInfo/JavaInfo.java
@@ -192,6 +192,8 @@ public String getJDKVendor() {
             return "microsoft";
         } else if (vendorLC.contains("loongson")) {
             return "loongson";
+        } else if (vendorLC.contains("fujitsu")) {
+            return "fujitsu";
 	} else {
             System.out.println("Warning: cannot determine vendor, use System.getProperty('java.vendor')=" + vendor + " directly.\n");
             return vendor;

From 46ec592bc1d144de9a06f78e498a4fc5695c89fc Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Wed, 28 Feb 2024 13:17:05 -0500
Subject: [PATCH 02/45] Add build dependencies for Mockito testcase

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index c8fedf0e..8de859b7 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -94,6 +94,21 @@
 		fname => 'junit4.jar',
 		sha1 => 'e4f1766ce7404a08f45d859fb9c226fc9e41a861'
 	},
+	mockito-core => {
+		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-core/5.9.0/mockito-core-5.9.0.jar',
+		fname => 'mockito-core.jar',
+		sha1 => 'faa88b96db3aeb96a93e83dec7491345bfbfc414'
+	},
+	byte-buddy => {
+		url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar',
+		fname => 'byte-buddy.jar',
+		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
+	},
+	maven-jar-plugin => {
+		url => 'https://repo1.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.3.0/maven-jar-plugin-3.3.0.jar',
+		fname => 'maven-jar-plugin.jar',
+		sha1 => '21829ae5feec95ae6fec425f2d85bbbfe49880c4'
+	},
 	testng => {
 		url => 'https://repo1.maven.org/maven2/org/testng/testng/6.14.2/testng-6.14.2.jar',
 		fname => 'testng.jar',

From 4929f1843db015c798a8e0d253233562505079ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 18:33:35 +0000
Subject: [PATCH 03/45] Bump actions/setup-java from 4.0.0 to 4.1.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/387ac29b308b003ca37ba93a6cab5eb57c8f5f93...9704b39bf258b59bc04b50fa2dd55e9ed76b47a8)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 3e8f506b..4f8cc722 100644
--- a/.github/workflows/testTKG.yml
+++ b/.github/workflows/testTKG.yml
@@ -12,7 +12,7 @@ jobs:
           ref: refs/pull/${{ github.event.issue.number }}/head
 
       - name: Set up JDK
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
         with:
           distribution: 'temurin'
           java-version: 11

From 33887889b5a88ec5bfd365e979ca0684978cc73c Mon Sep 17 00:00:00 2001
From: sophia-guo <sophia.gwf@gmail.com>
Date: Fri, 1 Mar 2024 10:24:49 -0500
Subject: [PATCH 04/45] Update TAP information for jck tests (#504)

Update to add all test output information if diagnostic is 'all'
Filter and summarize failure tests in a similar way to openjdk tests

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 60 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 scripts/resultsSum.pl

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
old mode 100644
new mode 100755
index b98bdbe1..cf80c811
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -159,10 +159,31 @@ sub resultReporter {
 						$numOfTotal++;
 						$tapString .= "not ok " . $numOfTotal . " - " . $testName . "\n";
 						$tapString .= "  ---\n";
-						if (($diagnostic eq 'failure') || ($diagnostic eq 'all')) {
+						# sometime jck test output shows after _FAILED message and before the $testName\E Finish Time
+
+						my $jckFailedDuration = '';
+						if ($buildList =~ /jck/) {
+							while ( my $extraFailedOutput = <$fhIn> ) {
+								$extraFailedOutput =~ s/\r//g;
+								$output .= '        ' . $extraFailedOutput;
+								if ($extraFailedOutput =~ /^\Q$testName\E Finish Time: .* Epoch Time \(ms\): (.*)\n/) {
+									if ($successRate ne "") {
+										$successRate =~ s/\((.*)\)/$1/;
+										$jckFailedDuration .= '    ' . $successRate . "\n";
+									}
+									$endTime = $1;
+									$jckFailedDuration .= "    duration_ms: " . ($endTime - $startTime) . "\n  ...\n";
+									last;
+								}
+							}
+						}
+
+						if ($diagnostic ne 'failure' || ($buildList !~ /openjdk/ && $buildList !~ /jck/)) {
+							$tapString .= $output;
+						} else { #rerun jdk or jck* custom target only work for diagnostic=failure
+							my @lines = split('\\n', $output);
+							my $failureTests = "";
 							if ($buildList =~ /openjdk/) {
-								my @lines = split('\\n', $output);
-								my $failureTests = "";
 								for my $i (0 .. $#lines) {
 									if ( $lines[$i] =~ /[-]{50}/) {
 										if ( ($lines[$i+1] =~ /(TEST: )(.*?)(\.java|\.sh|#.*)$/) || ($lines[$i+1] =~ /(Test results: .*)(failed|error)(: \d{1,}$)/) ) {
@@ -171,17 +192,33 @@ sub resultReporter {
 										}
 									}
 								}
-								if ( $failureTests eq "" ) {
-									# Output of dump or other non-test failures
-									$tapString .= $output;
-								} else {
-									$tapString .= "    output:\n      |\n";
-									$tapString .= "        Failed test cases: \n" . $failureTests;
+							} elsif ($buildList =~ /jck/) {
+								my $testResult = "";
+								for my $i (0 .. $#lines) {
+									$lines[$i] =~ s/^\s+|\s+$//g; 
+									if ( $lines[$i] =~ /(.*?)(\.html|#.*)(.*?)(Failed|Error\.)(.*?)/) {
+										my @testsInfo = split(/\s+/, $lines[$i]);
+										my $testName = $testsInfo[0];
+										$testName =~ s/#.*//;
+										print "Testname removed is " . $testName. "\n";
+										$failureTests .= '        ' ."TEST: " . $testName . "\n";
+									} elsif ( $lines[$i] =~  /(Test results: .*)(failed|error)(: \d{1,}$)/) {
+										$testResult = $lines[$i];
+									}
 								}
-							} else {
+								$failureTests .= '        ' .$testResult . "\n"; 
+
+							}
+							if ( $failureTests eq "" ) {
+								# Output of dump or other non-test failures
 								$tapString .= $output;
+							} else {
+								$tapString .= "    output:\n      |\n";
+								$tapString .= "        Failed test cases: \n" . $failureTests;
+								$tapString .= $jckFailedDuration ;
 							}
 						}
+						
 						if ($spec =~ /zos/) {
 							my $dmpDir = dirname($resultFile).'/'.$testName;
 							moveTDUMPS($output, $dmpDir, $spec);
@@ -213,7 +250,6 @@ sub resultReporter {
 				}
 			}
 		}
-
 		close $fhIn;
 	}
 
@@ -351,7 +387,7 @@ sub resultReporter {
 			print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
 		}
 	}
-	unlink($resultFile);
+    unlink($resultFile);
 
 	return ($numOfTotal, \@failed);
 }

From 7f42a8c5690c873d4893d02bd0fdd5f0b15d90f5 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Wed, 6 Mar 2024 15:11:55 -0500
Subject: [PATCH 05/45] Failed test cases 'Finish Time' information is nested.

Jump out of the nested loop to next possible loop.

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index cf80c811..79b19305 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -130,7 +130,7 @@ sub resultReporter {
 				}
 				my $startTime = 0;
 				my $endTime = 0;
-				while ( $result = <$fhIn> ) {
+			    while ( $result = <$fhIn> ) {
 					# remove extra carriage return
 					$result =~ s/\r//g;
 					$output .= '        ' . $result;
@@ -160,7 +160,7 @@ sub resultReporter {
 						$tapString .= "not ok " . $numOfTotal . " - " . $testName . "\n";
 						$tapString .= "  ---\n";
 						# sometime jck test output shows after _FAILED message and before the $testName\E Finish Time
-
+						my $isJckFailedTestFinish = 0;
 						my $jckFailedDuration = '';
 						if ($buildList =~ /jck/) {
 							while ( my $extraFailedOutput = <$fhIn> ) {
@@ -173,6 +173,7 @@ sub resultReporter {
 									}
 									$endTime = $1;
 									$jckFailedDuration .= "    duration_ms: " . ($endTime - $startTime) . "\n  ...\n";
+									$isJckFailedTestFinish = 1;
 									last;
 								}
 							}
@@ -223,6 +224,10 @@ sub resultReporter {
 							my $dmpDir = dirname($resultFile).'/'.$testName;
 							moveTDUMPS($output, $dmpDir, $spec);
 						}
+
+						if ( $isJckFailedTestFinish ) {
+							last;
+						}
 					} elsif ($result eq ($testName . "_DISABLED\n")) {
 						$result =~ s/_DISABLED\n$//;
 						push (@disabled, $result);

From 7080cb30ce25a751ba7e721c2528dd5cde141edd Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Thu, 7 Mar 2024 23:14:24 -0500
Subject: [PATCH 06/45] Add test results skipped regex

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index 79b19305..93438c77 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -203,7 +203,7 @@ sub resultReporter {
 										$testName =~ s/#.*//;
 										print "Testname removed is " . $testName. "\n";
 										$failureTests .= '        ' ."TEST: " . $testName . "\n";
-									} elsif ( $lines[$i] =~  /(Test results: .*)(failed|error)(: \d{1,}$)/) {
+									} elsif ( $lines[$i] =~  /(Test results: .*)(skipped|failed|error)(: \d{1,}$)/) {
 										$testResult = $lines[$i];
 									}
 								}

From 99b23a1ea350c5afd737d138c69e8d5c34bfebb6 Mon Sep 17 00:00:00 2001
From: varshm16 <59560992+varshm16@users.noreply.github.com>
Date: Sat, 9 Mar 2024 00:25:17 +0530
Subject: [PATCH 07/45] enabling disabled modes for Load level tests (#499)

---
 resources/ottawa.csv | 68 ++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/resources/ottawa.csv b/resources/ottawa.csv
index e7da23f9..d00dee1e 100644
--- a/resources/ottawa.csv
+++ b/resources/ottawa.csv
@@ -23,9 +23,9 @@ variation:Mode106,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,ye
 variation:Mode107,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode108,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode109,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,yes,no,yes,yes,yes,yes,yes
-variation:Mode109-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
+variation:Mode109-CS,no,no,no,no,no,no,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,no,no,no,no,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode110,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
-variation:Mode110-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
+variation:Mode110-CS,no,no,no,no,no,no,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,no,no,no,no,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode112,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode113,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode114,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
@@ -40,10 +40,10 @@ variation:Mode127,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no
 variation:Mode128,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode130,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode131,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
-variation:Mode136,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode136,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode137,yes,yes,yes,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
-variation:Mode138,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode139,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode138,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode139,no,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode140,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode141,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode142,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
@@ -55,7 +55,7 @@ variation:Mode147,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,ye
 variation:Mode148,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode149,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode150,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no
-variation:Mode150-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
+variation:Mode150-CS,no,no,no,no,no,no,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode152,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode153,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode154,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,no,no,no,no,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
@@ -64,7 +64,7 @@ variation:Mode156,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no
 variation:Mode157,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode158,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,yes,yes
 variation:Mode159,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,yes,no,no,yes,yes
-variation:Mode159-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,yes,yes
+variation:Mode159-CS,no,no,no,no,no,no,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,yes,yes
 variation:Mode166,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode167,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode168,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
@@ -98,35 +98,35 @@ variation:Mode204,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no
 variation:Mode205,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode206,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode300,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode301,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode303,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode304,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode305,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode306,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode307,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode350,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode351,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode301,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode303,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode304,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode305,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode306,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode307,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode350,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode351,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode353,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode354,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode355,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode356,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode357,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode357,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode400,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode401,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
-variation:Mode500,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,no,no,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
-variation:Mode501,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode503,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode504,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode505,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode506,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode507,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode550,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode551,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode553,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode554,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode555,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode556,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode557,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode500,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,no,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
+variation:Mode501,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode503,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode504,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode505,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode506,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode507,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode550,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode551,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode553,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode554,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode555,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode556,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode557,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode590,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode591,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode592,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
@@ -138,10 +138,10 @@ variation:Mode603,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes
 variation:Mode604,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode605,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode606,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode607,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode607,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode608,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode609,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,yes,yes,yes
-variation:Mode610,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode610,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode612,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode613,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode614,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
@@ -165,8 +165,8 @@ variation:Mode645,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes
 variation:Mode650,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,yes,yes,yes,yes,no
 variation:Mode685,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode686,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode687,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode688,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode687,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode688,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode107-OSR,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode110-OSR,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode112-OSR,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes

From d8408139c0a301475e149a01baa5771ac7da5a77 Mon Sep 17 00:00:00 2001
From: zzambers <zzambers@redhat.com>
Date: Mon, 11 Mar 2024 16:26:55 +0100
Subject: [PATCH 08/45] Fix schema location in playlist.xml files (#496)

---
 examples/base/playlist.xml                 | 2 +-
 examples/feature/playlist.xml              | 2 +-
 examples/hierarchy/a1/b1/playlist.xml      | 2 +-
 examples/hierarchy/a2/b2/c2/playlist.xml   | 2 +-
 examples/hierarchy/a2/b2/playlist.xml      | 2 +-
 examples/hierarchy/a2/d2/playlist.xml      | 2 +-
 examples/hierarchy/a2/playlist.xml         | 2 +-
 examples/hierarchy/a3/b3/playlist.xml      | 2 +-
 examples/hierarchy/a3/c3/d3/playlist.xml   | 2 +-
 examples/hierarchy/a3/f3/playlist.xml      | 2 +-
 examples/jdkVersion/playlist.xml           | 2 +-
 examples/platformRequirements/playlist.xml | 2 +-
 examples/rerun/playlist.xml                | 2 +-
 examples/rerun/rerunSub/playlist.xml       | 2 +-
 examples/sliceAndDice/level/playlist.xml   | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/examples/base/playlist.xml b/examples/base/playlist.xml
index da66a764..4f78dfc2 100644
--- a/examples/base/playlist.xml
+++ b/examples/base/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
 	<test>
 		<testCaseName>testSuccess</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/feature/playlist.xml b/examples/feature/playlist.xml
index aa5c72c8..a1853f12 100644
--- a/examples/feature/playlist.xml
+++ b/examples/feature/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
 	<test>
 		<testCaseName>testFeatureFips</testCaseName>
 		<command>echo "match FIPS140_3_20220501 and everything else by default"; \
diff --git a/examples/hierarchy/a1/b1/playlist.xml b/examples/hierarchy/a1/b1/playlist.xml
index c6c4ec56..edc4270e 100644
--- a/examples/hierarchy/a1/b1/playlist.xml
+++ b/examples/hierarchy/a1/b1/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_a1_b1</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/hierarchy/a2/b2/c2/playlist.xml b/examples/hierarchy/a2/b2/c2/playlist.xml
index 72498859..139930bf 100644
--- a/examples/hierarchy/a2/b2/c2/playlist.xml
+++ b/examples/hierarchy/a2/b2/c2/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_a2_b2_c2</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/hierarchy/a2/b2/playlist.xml b/examples/hierarchy/a2/b2/playlist.xml
index c26b141c..121d4089 100644
--- a/examples/hierarchy/a2/b2/playlist.xml
+++ b/examples/hierarchy/a2/b2/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_a2_b2</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/hierarchy/a2/d2/playlist.xml b/examples/hierarchy/a2/d2/playlist.xml
index 366614bc..5e00d80b 100644
--- a/examples/hierarchy/a2/d2/playlist.xml
+++ b/examples/hierarchy/a2/d2/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_a2_d2</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/hierarchy/a2/playlist.xml b/examples/hierarchy/a2/playlist.xml
index f1581ec4..94fcbb7e 100644
--- a/examples/hierarchy/a2/playlist.xml
+++ b/examples/hierarchy/a2/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_a2</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/hierarchy/a3/b3/playlist.xml b/examples/hierarchy/a3/b3/playlist.xml
index 5803f4bb..0e11f93b 100644
--- a/examples/hierarchy/a3/b3/playlist.xml
+++ b/examples/hierarchy/a3/b3/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_a3_b3</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/hierarchy/a3/c3/d3/playlist.xml b/examples/hierarchy/a3/c3/d3/playlist.xml
index a364099c..9063fb1b 100644
--- a/examples/hierarchy/a3/c3/d3/playlist.xml
+++ b/examples/hierarchy/a3/c3/d3/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_a3_b3_c3_d3</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/hierarchy/a3/f3/playlist.xml b/examples/hierarchy/a3/f3/playlist.xml
index d443f416..54b26324 100644
--- a/examples/hierarchy/a3/f3/playlist.xml
+++ b/examples/hierarchy/a3/f3/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_a3_f3</testCaseName>
 		<command>echo "success"; \
diff --git a/examples/jdkVersion/playlist.xml b/examples/jdkVersion/playlist.xml
index daf775cd..1bf5dfed 100644
--- a/examples/jdkVersion/playlist.xml
+++ b/examples/jdkVersion/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_ver_11</testCaseName>
 		<command>echo "test for version 11"; \
diff --git a/examples/platformRequirements/playlist.xml b/examples/platformRequirements/playlist.xml
index 514369e1..0bf3f54b 100644
--- a/examples/platformRequirements/playlist.xml
+++ b/examples/platformRequirements/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
 	<test>
 		<testCaseName>test_arch_x86</testCaseName>
 		<command>echo "test arch.x86"; \
diff --git a/examples/rerun/playlist.xml b/examples/rerun/playlist.xml
index d3ce6eef..83ec89b7 100644
--- a/examples/rerun/playlist.xml
+++ b/examples/rerun/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../resources/playlist.xsd">
 	<test>
 		<testCaseName>testRerun</testCaseName>
 		<command>echo "test rerun"; \
diff --git a/examples/rerun/rerunSub/playlist.xml b/examples/rerun/rerunSub/playlist.xml
index 67fbeebe..763b0a0f 100644
--- a/examples/rerun/rerunSub/playlist.xml
+++ b/examples/rerun/rerunSub/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>testRerunSubDir</testCaseName>
 		<command>echo "test rerun in sub dir"; \
diff --git a/examples/sliceAndDice/level/playlist.xml b/examples/sliceAndDice/level/playlist.xml
index af4eb302..2851f87f 100644
--- a/examples/sliceAndDice/level/playlist.xml
+++ b/examples/sliceAndDice/level/playlist.xml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/playlist.xsd">
+<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../resources/playlist.xsd">
 	<test>
 		<testCaseName>testDefault</testCaseName>
 		<command>echo "default is extended"; \

From fded79ef612228019440578a3a870bcfc27fe1c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 11:27:31 -0400
Subject: [PATCH 09/45] Bump actions/upload-artifact from 4.3.0 to 4.3.1 (#495)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/26f96dfa697d77e81fd5907df203aa23a56210a8...5d5d22a31266ced268874388b861e4b58bb5c2f3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 4dbd9ef9..1b4950a6 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@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
+    - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
       if: failure()
       with:
         name: test_output

From 6a93fd5140baed940ebfa4359093f5317c21d881 Mon Sep 17 00:00:00 2001
From: Lan Xia <Lan_Xia@ca.ibm.com>
Date: Mon, 11 Mar 2024 12:50:57 -0400
Subject: [PATCH 10/45] Revert "enabling disabled modes for Load level tests
 (#499)"

This reverts commit 99b23a1ea350c5afd737d138c69e8d5c34bfebb6.
---
 resources/ottawa.csv | 68 ++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/resources/ottawa.csv b/resources/ottawa.csv
index d00dee1e..e7da23f9 100644
--- a/resources/ottawa.csv
+++ b/resources/ottawa.csv
@@ -23,9 +23,9 @@ variation:Mode106,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,ye
 variation:Mode107,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode108,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode109,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,yes,no,yes,yes,yes,yes,yes
-variation:Mode109-CS,no,no,no,no,no,no,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,no,no,no,no,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
+variation:Mode109-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode110,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
-variation:Mode110-CS,no,no,no,no,no,no,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,no,no,no,no,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
+variation:Mode110-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode112,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode113,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode114,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
@@ -40,10 +40,10 @@ variation:Mode127,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no
 variation:Mode128,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode130,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode131,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
-variation:Mode136,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode136,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode137,yes,yes,yes,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
-variation:Mode138,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode139,no,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode138,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode139,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode140,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode141,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode142,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
@@ -55,7 +55,7 @@ variation:Mode147,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,ye
 variation:Mode148,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode149,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode150,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no
-variation:Mode150-CS,no,no,no,no,no,no,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
+variation:Mode150-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode152,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode153,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode154,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,no,no,no,no,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
@@ -64,7 +64,7 @@ variation:Mode156,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no
 variation:Mode157,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode158,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,yes,yes
 variation:Mode159,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,yes,no,no,yes,yes
-variation:Mode159-CS,no,no,no,no,no,no,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,yes,yes
+variation:Mode159-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,yes,yes
 variation:Mode166,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode167,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode168,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
@@ -98,35 +98,35 @@ variation:Mode204,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no
 variation:Mode205,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode206,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode300,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode301,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode303,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode304,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode305,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode306,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode307,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode350,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode351,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode301,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode303,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode304,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode305,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode306,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode307,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode350,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode351,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode353,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode354,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode355,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode356,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode357,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,yes,no,no,no,no,yes,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode357,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode400,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode401,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
-variation:Mode500,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,no,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
-variation:Mode501,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode503,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode504,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode505,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode506,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode507,no,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode550,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode551,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode553,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode554,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode555,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode556,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
-variation:Mode557,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode500,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,no,no,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
+variation:Mode501,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode503,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode504,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode505,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode506,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode507,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode550,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode551,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode553,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode554,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode555,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode556,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
+variation:Mode557,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode590,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode591,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode592,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
@@ -138,10 +138,10 @@ variation:Mode603,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes
 variation:Mode604,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode605,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
 variation:Mode606,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode607,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode607,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode608,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode609,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,yes,yes,yes
-variation:Mode610,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode610,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode612,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode613,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode614,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,no,no,no,no,no,yes,yes,yes,yes
@@ -165,8 +165,8 @@ variation:Mode645,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes
 variation:Mode650,no,yes,no,yes,no,yes,no,yes,no,yes,no,yes,yes,no,yes,no,yes,no,no,yes,yes,no,yes,no,yes,no,no,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,yes,yes,yes,yes,no
 variation:Mode685,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode686,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode687,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode688,no,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,yes,yes,yes,yes,yes,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode687,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
+variation:Mode688,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode107-OSR,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode110-OSR,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes
 variation:Mode112-OSR,yes,yes,no,yes,yes,yes,no,yes,yes,yes,no,yes,yes,no,yes,yes,yes,no,no,yes,yes,yes,yes,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,no,yes,yes,no,no,no,yes,no,yes,no,no,no,yes,yes,yes,yes

From 434ad4bc99feee93bb3315c97858c081cfcb3f80 Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Mon, 11 Mar 2024 16:57:34 -0400
Subject: [PATCH 11/45] update lib name

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 8de859b7..3a2b9205 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -94,17 +94,17 @@
 		fname => 'junit4.jar',
 		sha1 => 'e4f1766ce7404a08f45d859fb9c226fc9e41a861'
 	},
-	mockito-core => {
+	mockito_core => {
 		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-core/5.9.0/mockito-core-5.9.0.jar',
 		fname => 'mockito-core.jar',
 		sha1 => 'faa88b96db3aeb96a93e83dec7491345bfbfc414'
 	},
-	byte-buddy => {
+	byte_buddy => {
 		url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar',
 		fname => 'byte-buddy.jar',
 		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
 	},
-	maven-jar-plugin => {
+	maven_jar_plugin => {
 		url => 'https://repo1.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.3.0/maven-jar-plugin-3.3.0.jar',
 		fname => 'maven-jar-plugin.jar',
 		sha1 => '21829ae5feec95ae6fec425f2d85bbbfe49880c4'

From 128142167aef9b656859108f55542809fb59997b Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Mon, 11 Mar 2024 22:08:33 -0400
Subject: [PATCH 12/45] Remove maven_jar_plugin dependence

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 3a2b9205..64ede924 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -104,11 +104,6 @@
 		fname => 'byte-buddy.jar',
 		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
 	},
-	maven_jar_plugin => {
-		url => 'https://repo1.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.3.0/maven-jar-plugin-3.3.0.jar',
-		fname => 'maven-jar-plugin.jar',
-		sha1 => '21829ae5feec95ae6fec425f2d85bbbfe49880c4'
-	},
 	testng => {
 		url => 'https://repo1.maven.org/maven2/org/testng/testng/6.14.2/testng-6.14.2.jar',
 		fname => 'testng.jar',

From 887d69d9ccb101e9c1995a0bc0b5e9cad5ef8c86 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Mon, 11 Mar 2024 22:30:11 -0400
Subject: [PATCH 13/45] Test case results per test target

Test case results per test target in console output and tap file

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 53 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index 93438c77..a1e1643e 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -106,12 +106,17 @@ sub resultReporter {
 	my $numOfDisabled = 0;
 	my $numOfTotal = 0;
 	my $runningDisabled = 0;
+	my $numOfTestCasesPassed = 0;
+	my $numOfTestCasesFailed = 0;
+	my $numOfTestCasesError = 0;
+	my $numOfTestCasesSkipped = 0;
 	my @passed;
 	my @failed;
 	my @disabled;
 	my @capSkipped;
 	my $tapString = '';
 	my $fhIn;
+	my @testCasesResults;
 
 	print "\n\n";
 
@@ -130,6 +135,7 @@ sub resultReporter {
 				}
 				my $startTime = 0;
 				my $endTime = 0;
+				my $testTargetSummary = '';
 			    while ( $result = <$fhIn> ) {
 					# remove extra carriage return
 					$result =~ s/\r//g;
@@ -144,20 +150,32 @@ sub resultReporter {
 						$endTime = $1;
 						$tapString .= "    duration_ms: " . ($endTime - $startTime) . "\n  ...\n";
 						last;
+					} elsif ($result =~  /(Test results: .*)(passed|skipped|failed|error)(: \d{1,}$)/) {
+						$testTargetSummary = $result;
+						push (@testCasesResults, $result);					
 					} elsif ($result eq ($testName . "_PASSED\n")) {
-						push (@passed, $testName . " " . $successRate);
 						$numOfPassed++;
 						$numOfTotal++;
-						$tapString .= "ok " . $numOfTotal . " - " . $testName . "\n";
+						my $summarySuffix = '';
+						$tapString .= "ok " . $numOfTotal . " - " . $testName .  "\n";
 						$tapString .= "  ---\n";
+						if ( $testTargetSummary ) {
+							$summarySuffix = " - " . $testTargetSummary . " ";
+							$tapString .= "    output: " . $testTargetSummary;
+						}
+						push (@passed, $testName . $summarySuffix . $successRate);
 						if ($diagnostic eq 'all') {
 							$tapString .= $output;
 						}
 					} elsif ($result eq ($testName . "_FAILED\n")) {
-						push (@failed, $testName . " " . $successRate);
 						$numOfFailed++;
 						$numOfTotal++;
-						$tapString .= "not ok " . $numOfTotal . " - " . $testName . "\n";
+						my $summarySuffix = '';
+						if ( $testTargetSummary ) {
+							$summarySuffix = " - " . $testTargetSummary . " ";
+						}
+						push (@failed, $testName . $summarySuffix . $successRate);
+						$tapString .= "not ok " . $numOfTotal . " - " . $testName .  "\n";
 						$tapString .= "  ---\n";
 						# sometime jck test output shows after _FAILED message and before the $testName\E Finish Time
 						my $isJckFailedTestFinish = 0;
@@ -201,7 +219,6 @@ sub resultReporter {
 										my @testsInfo = split(/\s+/, $lines[$i]);
 										my $testName = $testsInfo[0];
 										$testName =~ s/#.*//;
-										print "Testname removed is " . $testName. "\n";
 										$failureTests .= '        ' ."TEST: " . $testName . "\n";
 									} elsif ( $lines[$i] =~  /(Test results: .*)(skipped|failed|error)(: \d{1,}$)/) {
 										$testResult = $lines[$i];
@@ -288,16 +305,16 @@ sub resultReporter {
 
 	$numOfExecuted = $numOfTotal - $numOfSkipped - $numOfDisabled;
 
-	my $testStatus = "TOTAL: $numOfTotal   EXECUTED: $numOfExecuted   PASSED: $numOfPassed   FAILED: $numOfFailed";
+	my $testTargetStatus = "TOTAL: $numOfTotal   EXECUTED: $numOfExecuted   PASSED: $numOfPassed   FAILED: $numOfFailed";
 	# Hide numOfDisabled when running disabled tests list.
 	if ($runningDisabled == 0) {
-		$testStatus .= "   DISABLED: $numOfDisabled";   
+		$testTargetStatus .= "   DISABLED: $numOfDisabled";   
 	}
-	$testStatus .= "   SKIPPED: $numOfSkipped";
+	$testTargetStatus .= "   SKIPPED: $numOfSkipped";
 	if ($comment ne "") {
-		$testStatus = "($testStatus)";
+		$testTargetStatus = "($testTargetStatus)";
 	}
-	print "$testStatus\n";
+	print "$testTargetStatus\n";
 	if ($numOfTotal > 0) {
 		# set tap file name if not given
 		if ($tapName eq '') {
@@ -342,8 +359,11 @@ sub resultReporter {
 			print $fhOut "# CUSTOM_TARGET: " . "${customTarget}" . "\n";
 		}
 
-		print $fhOut "# RESULTS_SUMMARY: TOTAL: $numOfTotal EXECUTED: $numOfExecuted PASSED: $numOfPassed FAILED: $numOfFailed DISABLED: $numOfDisabled SKIPPED: $numOfSkipped\n";
-
+		print $fhOut "# TEST TARGET RESULTS SUMMARY: $testTargetStatus\n";
+		if ( $buildList =~ /openjdk/ || $buildList =~ /jck/ ) {
+			print $fhOut "# TEST CASE RESULTS SUMMARY: " . "\n"; # TODO add details
+		}
+		
 		print $fhOut "1.." . $numOfTotal . "\n";
 		print $fhOut $tapString;
 		close $fhOut;
@@ -392,11 +412,18 @@ sub resultReporter {
 			print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
 		}
 	}
-    unlink($resultFile);
+	# Testing
+	print join(", ", @testCasesResults);
+    # unlink($resultFile);
 
 	return ($numOfTotal, \@failed);
 }
 
+sub getTestcasesResults() {
+	#parsing test results per targte
+
+}
+
 sub getTargetsFromResults() {
 	my $results = $_[0];
 	my @targets = ();

From 316f737df2bcdbfc1c55dbc9d50e48247f2ad8bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:47:11 +0000
Subject: [PATCH 14/45] Bump actions/checkout from 4.1.1 to 4.1.2

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.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/b4ffde65f46336ab88eb53be808477a3936bae11...9bb56186c3b09b4f86b1c65136769dd318469633)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 dde2bf5a..2fce3c08 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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml
index 1b4950a6..43e2a6f1 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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.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 4f8cc722..fe9da229 100644
--- a/.github/workflows/testTKG.yml
+++ b/.github/workflows/testTKG.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.event.comment.body, 'run tkg-test')
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
 

From b780f7b16a804fd49facfde72835032d85710208 Mon Sep 17 00:00:00 2001
From: Adam Brousseau <adam.brousseau@ca.ibm.com>
Date: Tue, 12 Mar 2024 15:21:10 -0400
Subject: [PATCH 15/45] Update to latest version of jcstress.jar

shasum 200da75e67689e8a604ec6fe9a6f55b2c000b6ce

Fixes #514

Signed-off-by: Adam Brousseau <adam.brousseau@ca.ibm.com>
---
 scripts/getDependencies.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 64ede924..c6f91659 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -170,9 +170,9 @@
 		sha1 => '15592c29538abd36d15570eda9fa055ed1a618ba'
 	},
 	jcstress => {
-		url => 'https://builds.shipilev.net/jcstress/jcstress-tests-all-20220908.jar',
-		fname => 'jcstress-tests-all-20220908.jar',
-		sha1 => '8cf348be49b8af939a3ce03216e3df53aa0f9ef2'
+		url => 'https://builds.shipilev.net/jcstress/jcstress-tests-all-20240222.jar',
+		fname => 'jcstress-tests-all-20240222.jar',
+		sha1 => '200da75e67689e8a604ec6fe9a6f55b2c000b6ce'
 	},
 	hamcrest_core => {
 		url => 'https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar',

From f1a2922e1481d3367d5510afdf6f72426d93b419 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Tue, 12 Mar 2024 16:21:23 -0400
Subject: [PATCH 16/45] Add testcase summary for all test targets

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 63 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index a1e1643e..a49b7567 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -106,10 +106,7 @@ sub resultReporter {
 	my $numOfDisabled = 0;
 	my $numOfTotal = 0;
 	my $runningDisabled = 0;
-	my $numOfTestCasesPassed = 0;
-	my $numOfTestCasesFailed = 0;
-	my $numOfTestCasesError = 0;
-	my $numOfTestCasesSkipped = 0;
+
 	my @passed;
 	my @failed;
 	my @disabled;
@@ -117,6 +114,7 @@ sub resultReporter {
 	my $tapString = '';
 	my $fhIn;
 	my @testCasesResults;
+	my $testCaseSummary;
 
 	print "\n\n";
 
@@ -161,8 +159,10 @@ sub resultReporter {
 						$tapString .= "  ---\n";
 						if ( $testTargetSummary ) {
 							$summarySuffix = " - " . $testTargetSummary . " ";
-							$tapString .= "    output: " . $testTargetSummary;
+							$tapString .= "    output:\n      |\n";
+							$tapString .= "        " . $testTargetSummary;
 						}
+
 						push (@passed, $testName . $summarySuffix . $successRate);
 						if ($diagnostic eq 'all') {
 							$tapString .= $output;
@@ -315,6 +315,14 @@ sub resultReporter {
 		$testTargetStatus = "($testTargetStatus)";
 	}
 	print "$testTargetStatus\n";
+	
+	print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n\n";
+	if (@testCasesResults) { 
+		$testCaseSummary = getTestcaseResults(\@testCasesResults);
+		print $testCaseSummary . "\n";
+		print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
+	}
+
 	if ($numOfTotal > 0) {
 		# set tap file name if not given
 		if ($tapName eq '') {
@@ -359,9 +367,9 @@ sub resultReporter {
 			print $fhOut "# CUSTOM_TARGET: " . "${customTarget}" . "\n";
 		}
 
-		print $fhOut "# TEST TARGET RESULTS SUMMARY: $testTargetStatus\n";
-		if ( $buildList =~ /openjdk/ || $buildList =~ /jck/ ) {
-			print $fhOut "# TEST CASE RESULTS SUMMARY: " . "\n"; # TODO add details
+		print $fhOut "# TEST TARGETS RESULTS SUMMARY: $testTargetStatus\n";
+		if ( $testCaseSummary ) {
+			print $fhOut "# $testCaseSummary " . "\n";
 		}
 		
 		print $fhOut "1.." . $numOfTotal . "\n";
@@ -371,9 +379,7 @@ sub resultReporter {
 			print "ALL TESTS PASSED\n";
 		}
 	}
-
-	print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
-
+	
 	if ($numOfFailed != 0) {
 		my $buildParam =  "";
 		if ($buildList ne '') {
@@ -412,16 +418,41 @@ sub resultReporter {
 			print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
 		}
 	}
-	# Testing
-	print join(", ", @testCasesResults);
-    # unlink($resultFile);
 
+    unlink($resultFile);
 	return ($numOfTotal, \@failed);
 }
 
-sub getTestcasesResults() {
-	#parsing test results per targte
+sub getTestcaseResults() {
+	my $testCaseResults = '';
+	my @resultsArray = @{$_[0]};
+	my $numOfTestCasesPassed = 0;
+	my $numOfTestCasesFailed = 0;
+	my $numOfTestCasesError = 0;
+	my $numOfTestCasesSkipped = 0;
 
+	for my $result (@resultsArray) {
+		$result =~ s/Test results: //;
+		my @statusNumbers = split(";", $result);
+		for my $statusNumber (@statusNumbers) {
+			$statusNumber =~ s/,//;
+			if ( $statusNumber =~ /passed: /) {
+				$statusNumber =~ s/passed: //;
+				$numOfTestCasesPassed += $statusNumber;
+			} elsif ( $statusNumber =~ /failed: / ) {
+				$statusNumber =~ s/failed: //;
+				$numOfTestCasesFailed += $statusNumber;
+			} elsif ( $statusNumber =~ /error: / ) {
+				$statusNumber =~ s/error: //;
+				$numOfTestCasesError += + $statusNumber;
+			} elsif ( $statusNumber =~ /skipped: / ) {
+				$statusNumber =~ s/skipped: //;
+				$numOfTestCasesSkipped += $statusNumber;
+			}
+		}		
+	}
+	$testCaseResults = "TESTCASES RESULTS SUMMARY: passed: " . $numOfTestCasesPassed .  "; failed: " . $numOfTestCasesFailed . "; error: " . $numOfTestCasesError . "; skipped: " . $numOfTestCasesSkipped;
+	return $testCaseResults;
 }
 
 sub getTargetsFromResults() {

From 85b4575b41d9fa2a5a213dd09fa5e4dc9bc8efc5 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Wed, 13 Mar 2024 09:42:37 -0400
Subject: [PATCH 17/45] Update varialbe name

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index a49b7567..49ec48fc 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -114,7 +114,7 @@ sub resultReporter {
 	my $tapString = '';
 	my $fhIn;
 	my @testCasesResults;
-	my $testCaseSummary;
+	my $testCasesAllTargetsSummary;
 
 	print "\n\n";
 
@@ -133,7 +133,7 @@ sub resultReporter {
 				}
 				my $startTime = 0;
 				my $endTime = 0;
-				my $testTargetSummary = '';
+				my $testCasesPerTargetSummary = '';
 			    while ( $result = <$fhIn> ) {
 					# remove extra carriage return
 					$result =~ s/\r//g;
@@ -149,7 +149,7 @@ sub resultReporter {
 						$tapString .= "    duration_ms: " . ($endTime - $startTime) . "\n  ...\n";
 						last;
 					} elsif ($result =~  /(Test results: .*)(passed|skipped|failed|error)(: \d{1,}$)/) {
-						$testTargetSummary = $result;
+						$testCasesPerTargetSummary = $result;
 						push (@testCasesResults, $result);					
 					} elsif ($result eq ($testName . "_PASSED\n")) {
 						$numOfPassed++;
@@ -157,10 +157,10 @@ sub resultReporter {
 						my $summarySuffix = '';
 						$tapString .= "ok " . $numOfTotal . " - " . $testName .  "\n";
 						$tapString .= "  ---\n";
-						if ( $testTargetSummary ) {
-							$summarySuffix = " - " . $testTargetSummary . " ";
+						if ( $testCasesPerTargetSummary ) {
+							$summarySuffix = " - " . $testCasesPerTargetSummary . " ";
 							$tapString .= "    output:\n      |\n";
-							$tapString .= "        " . $testTargetSummary;
+							$tapString .= "        " . $testCasesPerTargetSummary;
 						}
 
 						push (@passed, $testName . $summarySuffix . $successRate);
@@ -171,8 +171,8 @@ sub resultReporter {
 						$numOfFailed++;
 						$numOfTotal++;
 						my $summarySuffix = '';
-						if ( $testTargetSummary ) {
-							$summarySuffix = " - " . $testTargetSummary . " ";
+						if ( $testCasesPerTargetSummary ) {
+							$summarySuffix = " - " . $testCasesPerTargetSummary . " ";
 						}
 						push (@failed, $testName . $summarySuffix . $successRate);
 						$tapString .= "not ok " . $numOfTotal . " - " . $testName .  "\n";
@@ -318,8 +318,8 @@ sub resultReporter {
 	
 	print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n\n";
 	if (@testCasesResults) { 
-		$testCaseSummary = getTestcaseResults(\@testCasesResults);
-		print $testCaseSummary . "\n";
+		$testCasesAllTargetsSummary = getTestcaseResults(\@testCasesResults);
+		print $testCasesAllTargetsSummary . "\n";
 		print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
 	}
 
@@ -368,8 +368,8 @@ sub resultReporter {
 		}
 
 		print $fhOut "# TEST TARGETS RESULTS SUMMARY: $testTargetStatus\n";
-		if ( $testCaseSummary ) {
-			print $fhOut "# $testCaseSummary " . "\n";
+		if ( $testCasesAllTargetsSummary ) {
+			print $fhOut "# $testCasesAllTargetsSummary " . "\n";
 		}
 		
 		print $fhOut "1.." . $numOfTotal . "\n";

From 4d3c858fad4e8a031a5ea446e05648061d9e3e90 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Wed, 13 Mar 2024 11:01:18 -0400
Subject: [PATCH 18/45] Using hash table for test cases summary

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index 49ec48fc..ea82767e 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -426,32 +426,24 @@ sub resultReporter {
 sub getTestcaseResults() {
 	my $testCaseResults = '';
 	my @resultsArray = @{$_[0]};
-	my $numOfTestCasesPassed = 0;
-	my $numOfTestCasesFailed = 0;
-	my $numOfTestCasesError = 0;
-	my $numOfTestCasesSkipped = 0;
-
+	my %testCasesSummary = ( 'passed: ' => 0, 'failed: ' => 0, 'error: ' => 0, 'skipped: ' => 0 );
+	
 	for my $result (@resultsArray) {
 		$result =~ s/Test results: //;
 		my @statusNumbers = split(";", $result);
 		for my $statusNumber (@statusNumbers) {
 			$statusNumber =~ s/,//;
-			if ( $statusNumber =~ /passed: /) {
-				$statusNumber =~ s/passed: //;
-				$numOfTestCasesPassed += $statusNumber;
-			} elsif ( $statusNumber =~ /failed: / ) {
-				$statusNumber =~ s/failed: //;
-				$numOfTestCasesFailed += $statusNumber;
-			} elsif ( $statusNumber =~ /error: / ) {
-				$statusNumber =~ s/error: //;
-				$numOfTestCasesError += + $statusNumber;
-			} elsif ( $statusNumber =~ /skipped: / ) {
-				$statusNumber =~ s/skipped: //;
-				$numOfTestCasesSkipped += $statusNumber;
+			for (keys %testCasesSummary ) {
+				if ( $statusNumber =~ /\Q$_\E/) {
+					$statusNumber =~ s/\Q$_\E//;
+					$testCasesSummary{$_} += $statusNumber;
+					last;
+				}
 			}
 		}		
 	}
-	$testCaseResults = "TESTCASES RESULTS SUMMARY: passed: " . $numOfTestCasesPassed .  "; failed: " . $numOfTestCasesFailed . "; error: " . $numOfTestCasesError . "; skipped: " . $numOfTestCasesSkipped;
+	
+	$testCaseResults = "TESTCASES RESULTS SUMMARY: passed: " . $testCasesSummary{'passed: '} .  "; failed: " . $testCasesSummary{'failed: '} . "; error: " . $testCasesSummary{'error: '} . "; skipped: " . $testCasesSummary{'skipped: '};
 	return $testCaseResults;
 }
 

From 417b08722c9ae04484b121789cfa6efa090d7be3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 18:45:16 +0000
Subject: [PATCH 19/45] Bump actions/setup-java from 4.1.0 to 4.2.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/9704b39bf258b59bc04b50fa2dd55e9ed76b47a8...5896cecc08fd8a1fbdfaf517e29b571164b031f7)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@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 4f8cc722..43a15623 100644
--- a/.github/workflows/testTKG.yml
+++ b/.github/workflows/testTKG.yml
@@ -12,7 +12,7 @@ jobs:
           ref: refs/pull/${{ github.event.issue.number }}/head
 
       - name: Set up JDK
-        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+        uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
         with:
           distribution: 'temurin'
           java-version: 11

From a23f4126a2cf495091c96c95f39328c371e2e22f Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Wed, 13 Mar 2024 17:46:00 -0400
Subject: [PATCH 20/45] Remove mockito-core and byte_buddy as well to unblock
 issue 19122

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 64ede924..c8fedf0e 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -94,16 +94,6 @@
 		fname => 'junit4.jar',
 		sha1 => 'e4f1766ce7404a08f45d859fb9c226fc9e41a861'
 	},
-	mockito_core => {
-		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-core/5.9.0/mockito-core-5.9.0.jar',
-		fname => 'mockito-core.jar',
-		sha1 => 'faa88b96db3aeb96a93e83dec7491345bfbfc414'
-	},
-	byte_buddy => {
-		url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar',
-		fname => 'byte-buddy.jar',
-		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
-	},
 	testng => {
 		url => 'https://repo1.maven.org/maven2/org/testng/testng/6.14.2/testng-6.14.2.jar',
 		fname => 'testng.jar',

From e6e661243700c13bf10e316739d2e4a6b3ff0133 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Thu, 14 Mar 2024 09:13:04 -0400
Subject: [PATCH 21/45] Limite overall testcases summary for all targets to
 openjdk and jck only

Some of other category tests might also run with jtreg. In that case
testcase summary per target is still useful.

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index ea82767e..51f37303 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -317,7 +317,7 @@ sub resultReporter {
 	print "$testTargetStatus\n";
 	
 	print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n\n";
-	if (@testCasesResults) { 
+	if (@testCasesResults && ($buildList =~ /openjdk/ || $buildList =~ /jck/)) { 
 		$testCasesAllTargetsSummary = getTestcaseResults(\@testCasesResults);
 		print $testCasesAllTargetsSummary . "\n";
 		print "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";

From 28c6b2350a082f579ba71146de3d433eafe9c696 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 18:44:22 +0000
Subject: [PATCH 22/45] Bump actions/setup-java from 4.2.0 to 4.2.1

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/5896cecc08fd8a1fbdfaf517e29b571164b031f7...99b8673ff64fbf99d8d325f52d9a5bdedb8483e9)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 a2b8f1b7..63468f08 100644
--- a/.github/workflows/testTKG.yml
+++ b/.github/workflows/testTKG.yml
@@ -12,7 +12,7 @@ jobs:
           ref: refs/pull/${{ github.event.issue.number }}/head
 
       - name: Set up JDK
-        uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'temurin'
           java-version: 11

From f1c8301649285ef11fb71364ea7d9cd03261c442 Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Tue, 19 Mar 2024 12:10:42 -0400
Subject: [PATCH 23/45] added new dependences for mockito test case

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 45a4d031..beb06e32 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -94,6 +94,36 @@
 		fname => 'junit4.jar',
 		sha1 => 'e4f1766ce7404a08f45d859fb9c226fc9e41a861'
 	},
+	mockito_junit_jupiter => {
+		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter/5.8.0/mockito-junit-jupiter-5.8.0.jar',
+		fname => 'mockito-junit-jupiter.jar',
+		sha1 => 'c6ee9a4267376d0a060e78b7e8af5cbc199bbbfc'
+	},
+	junit_jupiter_api => {
+		url => 'https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.8.0/junit-jupiter-api-5.8.0.jar',
+		fname => 'junit-jupiter-api',
+		sha1 => '1afdba46bfdf3f23de4910f5f257be8d3dcfc3c7'
+	},
+	mockito_core => {
+		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-core/5.8.0/mockito-core-5.8.0.jar',
+		fname => 'mockito-core.jar',
+		sha1 => 'df310627f77f859114ad31e1376fff0dce263cca'
+	},
+	byte_buddy => {
+		url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar',
+		fname => 'byte-buddy.jar',
+		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
+	},
+	maven_surefire_plugin => {
+		url => 'https://repo1.maven.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/3.2.2/maven-surefire-plugin-3.2.2.jar',
+		fname => 'maven-surefire-plugin.jar',
+		sha1 => '11d4e9b45ce0953096896475ab212a605a63854e'
+	},
+	maven_jar_plugin => {
+		url => 'https://repo1.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.3.0/maven-jar-plugin-3.3.0.jar',
+		fname => 'maven-jar-plugin.jar',
+		sha1 => '21829ae5feec95ae6fec425f2d85bbbfe49880c4'
+	},
 	testng => {
 		url => 'https://repo1.maven.org/maven2/org/testng/testng/6.14.2/testng-6.14.2.jar',
 		fname => 'testng.jar',

From 8ab504ad8f5943913e9a90f60e413cf9fe65091a Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Tue, 19 Mar 2024 15:05:28 -0400
Subject: [PATCH 24/45] fix with .jar

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index beb06e32..85efafc4 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -101,7 +101,7 @@
 	},
 	junit_jupiter_api => {
 		url => 'https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.8.0/junit-jupiter-api-5.8.0.jar',
-		fname => 'junit-jupiter-api',
+		fname => 'junit-jupiter-api.jar',
 		sha1 => '1afdba46bfdf3f23de4910f5f257be8d3dcfc3c7'
 	},
 	mockito_core => {

From 00b11171bd77ec8fe1be4380e83a31c27ded782a Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Wed, 20 Mar 2024 14:02:41 -0400
Subject: [PATCH 25/45] fix

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 85efafc4..08d54d2f 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -114,16 +114,6 @@
 		fname => 'byte-buddy.jar',
 		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
 	},
-	maven_surefire_plugin => {
-		url => 'https://repo1.maven.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/3.2.2/maven-surefire-plugin-3.2.2.jar',
-		fname => 'maven-surefire-plugin.jar',
-		sha1 => '11d4e9b45ce0953096896475ab212a605a63854e'
-	},
-	maven_jar_plugin => {
-		url => 'https://repo1.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/3.3.0/maven-jar-plugin-3.3.0.jar',
-		fname => 'maven-jar-plugin.jar',
-		sha1 => '21829ae5feec95ae6fec425f2d85bbbfe49880c4'
-	},
 	testng => {
 		url => 'https://repo1.maven.org/maven2/org/testng/testng/6.14.2/testng-6.14.2.jar',
 		fname => 'testng.jar',

From b6652b6ef79ac4e7ec9db98931485732c21fd720 Mon Sep 17 00:00:00 2001
From: Anna Babu Palathingal <148897727+annaibm@users.noreply.github.com>
Date: Mon, 25 Mar 2024 22:52:11 -0400
Subject: [PATCH 26/45] Add GH permissions (#519)

- Add GH action permissions for testTKG job
Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
---
 .github/workflows/testTKG.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml
index 63468f08..49ae08aa 100644
--- a/.github/workflows/testTKG.yml
+++ b/.github/workflows/testTKG.yml
@@ -4,6 +4,10 @@ on:
     types: [created]
 jobs:
   testTKG:
+    permissions:
+        contents: read
+        issues: write
+        pull-requests: write
     runs-on: ubuntu-latest
     if: startsWith(github.event.comment.body, 'run tkg-test')
     steps:

From b7b883873375de2dad652de26a7b140ebf322db5 Mon Sep 17 00:00:00 2001
From: Anna Babu Palathingal <148897727+annaibm@users.noreply.github.com>
Date: Thu, 28 Mar 2024 10:20:15 -0400
Subject: [PATCH 27/45] Update the Github Actions permission (#523)

- Update the content permission to `write` for testTKG joob

Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.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 49ae08aa..41535a1a 100644
--- a/.github/workflows/testTKG.yml
+++ b/.github/workflows/testTKG.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   testTKG:
     permissions:
-        contents: read
+        contents: write
         issues: write
         pull-requests: write
     runs-on: ubuntu-latest

From 04d5ce9eb80702df07f59c51ab086ae14f3f2866 Mon Sep 17 00:00:00 2001
From: Anna Babu Palathingal <148897727+annaibm@users.noreply.github.com>
Date: Wed, 27 Mar 2024 12:58:05 -0400
Subject: [PATCH 28/45] Adding the GH action permission to entire workflow -
 Update the content permission to `write` for testTKG joob

Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
---
 .github/workflows/testTKG.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/testTKG.yml b/.github/workflows/testTKG.yml
index 41535a1a..6027b323 100644
--- a/.github/workflows/testTKG.yml
+++ b/.github/workflows/testTKG.yml
@@ -2,6 +2,10 @@ name: "Run TKG Tests"
 on:
   issue_comment:
     types: [created]
+permissions:
+    contents: write
+    issues: write
+    pull-requests: write
 jobs:
   testTKG:
     permissions:

From 6c18b1e96f0a8a1bbd2a4c1126fd784d6bdf9495 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Fri, 5 Apr 2024 13:03:26 -0400
Subject: [PATCH 29/45] Parse numbers with coma and remove extra new lines

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index 51f37303..561a88d1 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -148,8 +148,9 @@ sub resultReporter {
 						$endTime = $1;
 						$tapString .= "    duration_ms: " . ($endTime - $startTime) . "\n  ...\n";
 						last;
-					} elsif ($result =~  /(Test results: .*)(passed|skipped|failed|error)(: \d{1,}$)/) {
+					} elsif ($result =~  /(Test results: .*)(passed|skipped|failed|error)(: .*\d{1,}$)/) {
 						$testCasesPerTargetSummary = $result;
+						chomp($testCasesPerTargetSummary);
 						push (@testCasesResults, $result);					
 					} elsif ($result eq ($testName . "_PASSED\n")) {
 						$numOfPassed++;

From 0f194c898afbcd9872f2558b2c529c11503b395b Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Fri, 5 Apr 2024 17:13:35 -0400
Subject: [PATCH 30/45] Testcase status format update

Update Test target Tap file format
Use commas as thousands seperator

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index 561a88d1..3ba19eae 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -161,7 +161,7 @@ sub resultReporter {
 						if ( $testCasesPerTargetSummary ) {
 							$summarySuffix = " - " . $testCasesPerTargetSummary . " ";
 							$tapString .= "    output:\n      |\n";
-							$tapString .= "        " . $testCasesPerTargetSummary;
+							$tapString .= "        " . $testCasesPerTargetSummary .  "\n";
 						}
 
 						push (@passed, $testName . $summarySuffix . $successRate);
@@ -443,6 +443,10 @@ ()
 			}
 		}		
 	}
+
+	for (keys %testCasesSummary ) {
+		while ($testCasesSummary{$_} =~ s/^(\d+)(\d{3})/$1,$2/) {}
+	}
 	
 	$testCaseResults = "TESTCASES RESULTS SUMMARY: passed: " . $testCasesSummary{'passed: '} .  "; failed: " . $testCasesSummary{'failed: '} . "; error: " . $testCasesSummary{'error: '} . "; skipped: " . $testCasesSummary{'skipped: '};
 	return $testCaseResults;

From eff0c3c89010aec78a93254dacd8bebec764674f Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Mon, 8 Apr 2024 13:21:49 -0400
Subject: [PATCH 31/45] added junit-platform-console-standalone.jar

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 08d54d2f..1417f3ad 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -114,6 +114,11 @@
 		fname => 'byte-buddy.jar',
 		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
 	},
+	junit_platform_console_standalone=> {
+		url => 'https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console-standalone/1.10.2/junit-platform-console-standalone-1.10.2.jar',
+		fname => 'junit-platform-console-standalone.jar',
+		sha1 => '552303cce67dc3485ded393d744c0f6b5cae355b'
+	},
 	testng => {
 		url => 'https://repo1.maven.org/maven2/org/testng/testng/6.14.2/testng-6.14.2.jar',
 		fname => 'testng.jar',

From ce8ce637878b93e38297cc79804ece21d9fd699c Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Tue, 9 Apr 2024 13:53:30 -0400
Subject: [PATCH 32/45] removed mockito-junit-jupiter.jar

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 1417f3ad..60865b45 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -94,11 +94,6 @@
 		fname => 'junit4.jar',
 		sha1 => 'e4f1766ce7404a08f45d859fb9c226fc9e41a861'
 	},
-	mockito_junit_jupiter => {
-		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter/5.8.0/mockito-junit-jupiter-5.8.0.jar',
-		fname => 'mockito-junit-jupiter.jar',
-		sha1 => 'c6ee9a4267376d0a060e78b7e8af5cbc199bbbfc'
-	},
 	junit_jupiter_api => {
 		url => 'https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.8.0/junit-jupiter-api-5.8.0.jar',
 		fname => 'junit-jupiter-api.jar',

From de21f07b72ca5b95e6778911ef17815983251422 Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Tue, 9 Apr 2024 14:07:43 -0400
Subject: [PATCH 33/45] added back byte-buddy.jar

sign-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index 60865b45..b66e0d33 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -74,6 +74,21 @@
 		fname => 'asm.jar',
 		sha1 => 'a0f58cad836a410f6ba133aaa209aea7e54aaf8a'
 	},
+	byte_buddy => {
+		url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar',
+		fname => 'byte-buddy.jar',
+		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
+	},
+	byte_buddy_agent => {
+		url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.12/byte-buddy-agent-1.14.12.jar',
+		fname => 'byte-buddy-agent.jar',
+		sha1 => 'be4984cb6fd1ef1d11f218a648889dfda44b8a15'
+	 },
+	objenesis => {
+		url => 'https://repo1.maven.org/maven2/org/objenesis/objenesis/3.3/objenesis-3.3.jar',
+		fname => 'objenesis.jar',
+		sha1 => '1049c09f1de4331e8193e579448d0916d75b7631'
+	 },
 	commons_cli => {
 		url => 'https://repo1.maven.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.jar',
 		fname => 'commons-cli.jar',
@@ -100,19 +115,9 @@
 		sha1 => '1afdba46bfdf3f23de4910f5f257be8d3dcfc3c7'
 	},
 	mockito_core => {
-		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-core/5.8.0/mockito-core-5.8.0.jar',
+		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-core/5.9.0/mockito-core-5.9.0.jar',
 		fname => 'mockito-core.jar',
-		sha1 => 'df310627f77f859114ad31e1376fff0dce263cca'
-	},
-	byte_buddy => {
-		url => 'https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12/byte-buddy-1.14.12.jar',
-		fname => 'byte-buddy.jar',
-		sha1 => '6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1'
-	},
-	junit_platform_console_standalone=> {
-		url => 'https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console-standalone/1.10.2/junit-platform-console-standalone-1.10.2.jar',
-		fname => 'junit-platform-console-standalone.jar',
-		sha1 => '552303cce67dc3485ded393d744c0f6b5cae355b'
+		sha1 => 'faa88b96db3aeb96a93e83dec7491345bfbfc414'
 	},
 	testng => {
 		url => 'https://repo1.maven.org/maven2/org/testng/testng/6.14.2/testng-6.14.2.jar',

From ee66abd808442a431da6e3681a843d92be860f21 Mon Sep 17 00:00:00 2001
From: Minghong Xu <Minghong.Xu@ibm.com>
Date: Fri, 12 Apr 2024 11:22:26 -0400
Subject: [PATCH 34/45] fix mockito-core with latest version 5.11.0

Signed-off-by: Minghong Xu <Minghong.Xu@ibm.com>
---
 scripts/getDependencies.pl | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index b66e0d33..b8d2b94b 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -109,15 +109,10 @@
 		fname => 'junit4.jar',
 		sha1 => 'e4f1766ce7404a08f45d859fb9c226fc9e41a861'
 	},
-	junit_jupiter_api => {
-		url => 'https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.8.0/junit-jupiter-api-5.8.0.jar',
-		fname => 'junit-jupiter-api.jar',
-		sha1 => '1afdba46bfdf3f23de4910f5f257be8d3dcfc3c7'
-	},
 	mockito_core => {
-		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-core/5.9.0/mockito-core-5.9.0.jar',
+		url => 'https://repo1.maven.org/maven2/org/mockito/mockito-core/5.11.0/mockito-core-5.11.0.jar',
 		fname => 'mockito-core.jar',
-		sha1 => 'faa88b96db3aeb96a93e83dec7491345bfbfc414'
+		sha1 => 'e4069fa4f4ff2c94322cfec5f2e45341c6c70aff'
 	},
 	testng => {
 		url => 'https://repo1.maven.org/maven2/org/testng/testng/6.14.2/testng-6.14.2.jar',

From 9f402b1b5128a5462a795ddc1dc21eecbfb4e9dc Mon Sep 17 00:00:00 2001
From: KONNO Kazuhiro <33821890+knn-k@users.noreply.github.com>
Date: Tue, 16 Apr 2024 23:09:36 +0900
Subject: [PATCH 35/45] Disable Mode158 on AArch64 Linux (#528)

This commit disables Mode158 on AArch64 Linux.
Mode158 is described as "test 3bit shifting(z/OS only)".

Signed-off-by: KONNO Kazuhiro <konno@jp.ibm.com>
---
 resources/ottawa.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/ottawa.csv b/resources/ottawa.csv
index e7da23f9..63bdca7b 100644
--- a/resources/ottawa.csv
+++ b/resources/ottawa.csv
@@ -62,7 +62,7 @@ variation:Mode154,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,no,
 variation:Mode155,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,yes,yes
 variation:Mode156,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode157,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
-variation:Mode158,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,yes,yes
+variation:Mode158,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode159,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,yes,no,no,yes,yes
 variation:Mode159-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,yes,yes
 variation:Mode166,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes

From 14de8ce3179cbb7e0092189279917f294a2c6daa Mon Sep 17 00:00:00 2001
From: Anna Babu Palathingal <anna.bp@ibm.com>
Date: Fri, 1 Dec 2023 16:58:54 -0500
Subject: [PATCH 36/45] Added code to detect micro architecture

- zlinux version detection
- add tests

Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
---
 examples/platformRequirements/playlist.xml   |  70 ++++-
 makeGen.mk                                   |   2 +-
 scripts/testTKG/test_platformRequirements.py | 259 ++++++++++++-------
 src/org/openj9/envInfo/MachineInfo.java      |  36 ++-
 src/org/testKitGen/TestInfoParser.java       |  64 +++--
 5 files changed, 295 insertions(+), 136 deletions(-)

diff --git a/examples/platformRequirements/playlist.xml b/examples/platformRequirements/playlist.xml
index 0bf3f54b..5a309164 100644
--- a/examples/platformRequirements/playlist.xml
+++ b/examples/platformRequirements/playlist.xml
@@ -107,5 +107,73 @@
 	$(TEST_STATUS)</command>
 		<platformRequirements>^os.linux.ubuntu.20+</platformRequirements>
 	</test>
+	<test>
+		<testCaseName>test_not_arch_390</testCaseName>
+		<command>echo "test on none arch.390"; \
+	$(TEST_STATUS)</command>
+		<platformRequirements>^arch.390</platformRequirements>
+	</test>
+
+	<test>
+		<testCaseName>test_arch_x86_skylake</testCaseName>
+		<command>echo "test arch.x86.skylake"; \
+		$(TEST_STATUS)</command>
+		<platformRequirementsList>
+			<platformRequirements>arch.x86.skylake</platformRequirements>
+		</platformRequirementsList>
+	</test>
+
+	<test>
+		<testCaseName>test_arch_390_z15plus</testCaseName>
+		<command>echo "test arch.390.z15+"; \
+		$(TEST_STATUS)</command>
+		<platformRequirementsList>
+			<platformRequirements>arch.390.z15+</platformRequirements>
+		</platformRequirementsList>
+	</test>
+
+	<test>
+		<testCaseName>test_arch_390_z15</testCaseName>
+		<command>echo "test arch.390.z15"; \
+		$(TEST_STATUS)</command>
+		<platformRequirementsList>
+			<platformRequirements>arch.390.z15</platformRequirements>
+		</platformRequirementsList>
+	</test>
+	<test>
+		<testCaseName>test_arch_390_z14plus</testCaseName>
+		<command>echo "test arch.390.z14+"; \
+		$(TEST_STATUS)</command>
+		<platformRequirementsList>
+			<platformRequirements>arch.390.z14+</platformRequirements>
+		</platformRequirementsList>
+	</test>
+
+	<test>
+		<testCaseName>test_arch_390_z14</testCaseName>
+		<command>echo "test arch.390.z14"; \
+		$(TEST_STATUS)</command>
+		<platformRequirementsList>
+			<platformRequirements>arch.390.z14</platformRequirements>
+		</platformRequirementsList>
+	</test>
+
+	<test>
+		<testCaseName>test_arch_390_z13plus</testCaseName>
+		<command>echo "test arch.390.z13+"; \
+		$(TEST_STATUS)</command>
+		<platformRequirementsList>
+			<platformRequirements>arch.390.z13+</platformRequirements>
+		</platformRequirementsList>
+	</test>
+
+	<test>
+		<testCaseName>test_arch_390_z13</testCaseName>
+		<command>echo "test arch.390.z13"; \
+		$(TEST_STATUS)</command>
+		<platformRequirementsList>
+			<platformRequirements>arch.390.z13</platformRequirements>
+		</platformRequirementsList>
+	</test>
 
-</playlist>
+</playlist>
\ No newline at end of file
diff --git a/makeGen.mk b/makeGen.mk
index 4db53d59..89ece3ea 100644
--- a/makeGen.mk
+++ b/makeGen.mk
@@ -42,7 +42,7 @@ autoconfig:
 	perl scripts$(D)configure.pl
 
 autogen: autoconfig
-	${TEST_JDK_HOME}/bin/java -cp $(Q)$(TKG_JAR)$(P)$(JSON_SIMPLE)$(Q) org.testKitGen.MainRunner --mode=$(MODE) --spec=$(SPEC) --microArch=$(MICROARCH) --osLabel=$(Q)$(OS_LABEL)$(Q) --jdkVersion=$(JDK_VERSION) --impl=$(JDK_IMPL) --vendor=$(Q)$(JDK_VENDOR)$(Q) --buildList=${BUILD_LIST} --iterations=$(TKG_ITERATIONS) --aotIterations=$(AOT_ITERATIONS) --testFlag=$(TEST_FLAG) --testTarget=$(TESTTARGET) --testList=$(TESTLIST) --numOfMachines=$(NUM_MACHINES) --testTime=$(TEST_TIME) --TRSSURL=$(TRSS_URL) $(OPTS)
+	${TEST_JDK_HOME}/bin/java -cp $(Q)$(TKG_JAR)$(P)$(JSON_SIMPLE)$(Q) org.testKitGen.MainRunner --mode=$(MODE) --spec=$(SPEC) --microArch=$(Q)$(MICROARCH)$(Q) --osLabel=$(Q)$(OS_LABEL)$(Q) --jdkVersion=$(JDK_VERSION) --impl=$(JDK_IMPL) --vendor=$(Q)$(JDK_VENDOR)$(Q) --buildList=${BUILD_LIST} --iterations=$(TKG_ITERATIONS) --aotIterations=$(AOT_ITERATIONS) --testFlag=$(TEST_FLAG) --testTarget=$(TESTTARGET) --testList=$(TESTLIST) --numOfMachines=$(NUM_MACHINES) --testTime=$(TEST_TIME) --TRSSURL=$(TRSS_URL) $(OPTS)
 
 AUTOGEN_FILES = $(wildcard $(CURRENT_DIR)$(D)jvmTest.mk)
 AUTOGEN_FILES += $(wildcard $(CURRENT_DIR)$(D)machineConfigure.mk)
diff --git a/scripts/testTKG/test_platformRequirements.py b/scripts/testTKG/test_platformRequirements.py
index 62e0bc65..a41d4c5b 100644
--- a/scripts/testTKG/test_platformRequirements.py
+++ b/scripts/testTKG/test_platformRequirements.py
@@ -16,105 +16,164 @@
 from utils import *
 
 def run_test():
-    rt = True
-    printTestheader("platformRequirements")
-
-    buildList = "TKG/examples/platformRequirements"
-    command = "make _all"
-    print(f"\t{command}")
-    result = subprocess.run(f"{EXPORT_BUILDLIST}={buildList}; {CD_TKG}; {MAKE_CLEAN}; {MAKE_COMPILE}; {command}", stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True, check=False)
-
-    stdout = result.stdout.decode()
-    specStr = re.search(r"set SPEC to (.*)", stdout)
-
-    if specStr is not None:
-        spec = specStr.group(1)
-    else:
-        printError("Could not parse spec from output.")
-        return False
-
-    passed = set()
-    skipped = set()
-
-    if 'linux' in spec:
-        skipped.add('test_not_linux_arch_x86_0')
-    else:
-        if 'x86' in spec:
-            passed.add('test_not_linux_arch_x86_0')
-        else:
-            skipped.add('test_not_linux_arch_x86_0')
-
-    if 'x86' in spec:
-        passed.add('test_arch_x86_0')
-        skipped.add('test_arch_nonx86_0')
-    else:
-        passed.add('test_arch_nonx86_0')
-        skipped.add('test_arch_x86_0')
-
-    if '64' in spec:
-        passed.add('test_bits_64_0')
-    else:
-        skipped.add('test_bits_64_0')
-
-    if 'osx' in spec:
-        passed.add('test_os_osx_0')
-    else:
-        skipped.add('test_os_osx_0')
-
-    if 'osx_x86-64' in spec:
-        passed.add('test_osx_x86-64_0')
-    else:
-        skipped.add('test_osx_x86-64_0')
-
-    if 'x86' in spec or '390' in spec:
-        passed.add('test_arch_x86_390_0')
-    else:
-        skipped.add('test_arch_x86_390_0')
-
-    if 'osx_x86-64' in spec or ('win_x86' in spec and 'win_x86-64' not in spec) or 'aix_ppc-64' in spec:
-        passed.add('test_osx_x86-64_win_x86_aix_ppc-64_0')
-    else:
-        skipped.add('test_osx_x86-64_win_x86_aix_ppc-64_0')
-
-    os_label = re.search(r"set OS_LABEL to (.*)", stdout)
-    if os_label is not None:
-        os_label = os_label.group(1)
-        label_str = os_label.split(".")
-        # os_label example: ubuntu.22
-        try:
-            ver = int(label_str[1],10)
-            if label_str[0] == "ubuntu":
-                if ver >= 22:
-                    passed.add('test_os_linux_ubuntu22_0')
-                if ver >= 20:
-                    passed.add('test_os_linux_ubuntu20plus_0')
-                    passed.add('test_os_linux_ubuntu20plus_rhel8plus_0')
-                if ver < 20:
-                    passed.add('test_not_os_linux_ubuntu20plus_0')
-
-            if label_str[0] == "rhel":
-                if ver >= 8:
-                    passed.add('test_os_linux_ubuntu20plus_rhel8plus_0')
-        except ValueError as ve:
-            print ("warning: os version value failed to convert to an integer")
-            passed.add('test_not_os_linux_ubuntu20plus_0')
-    else:
-        passed.add('test_not_os_linux_ubuntu20plus_0')
-
-    if 'test_os_linux_ubuntu20plus_0' not in passed:
-        skipped.add('test_os_linux_ubuntu20plus_0')
-
-    if 'test_os_linux_ubuntu22_0' not in passed:
-        skipped.add('test_os_linux_ubuntu22_0')
-
-    if 'test_os_linux_ubuntu20plus_rhel8plus_0' not in passed:
-        skipped.add('test_os_linux_ubuntu20plus_rhel8plus_0')
-
-    if 'test_not_os_linux_ubuntu20plus_0' not in passed:
-        skipped.add('test_not_os_linux_ubuntu20plus_0')
-
-    rt &= checkResult(result, passed, set(), set(), skipped)
-    return rt
+	rt = True
+	printTestheader("platformRequirements")
+
+	buildList = "TKG/examples/platformRequirements"
+	command = "make _all"
+	print(f"\t{command}")
+	result = subprocess.run(f"{EXPORT_BUILDLIST}={buildList}; {CD_TKG}; {MAKE_CLEAN}; {MAKE_COMPILE}; {command}", stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True, check=False)
+
+	stdout = result.stdout.decode()
+	specStr = re.search(r"set SPEC to (.*)", stdout)
+
+	if specStr is not None:
+		spec = specStr.group(1)
+	else:
+		printError("Could not parse spec from output.")
+		return False
+
+	passed = set()
+	skipped = set()
+
+	if 'linux' in spec:
+		skipped.add('test_not_linux_arch_x86_0')
+	else:
+		if 'x86' in spec:
+			passed.add('test_not_linux_arch_x86_0')
+		else:
+			skipped.add('test_not_linux_arch_x86_0')
+
+	if 'x86' in spec:
+		passed.add('test_arch_x86_0')
+		skipped.add('test_arch_nonx86_0')
+	else:
+		passed.add('test_arch_nonx86_0')
+		skipped.add('test_arch_x86_0')
+
+	if '64' in spec:
+		passed.add('test_bits_64_0')
+	else:
+		skipped.add('test_bits_64_0')
+
+	if 'osx' in spec:
+		passed.add('test_os_osx_0')
+	else:
+		skipped.add('test_os_osx_0')
+
+	if 'osx_x86-64' in spec:
+		passed.add('test_osx_x86-64_0')
+	else:
+		skipped.add('test_osx_x86-64_0')
+
+	if 'x86' in spec or '390' in spec:
+		passed.add('test_arch_x86_390_0')
+	else:
+		skipped.add('test_arch_x86_390_0')
+
+	if 'osx_x86-64' in spec or ('win_x86' in spec and 'win_x86-64' not in spec) or 'aix_ppc-64' in spec:
+		passed.add('test_osx_x86-64_win_x86_aix_ppc-64_0')
+	else:
+		skipped.add('test_osx_x86-64_win_x86_aix_ppc-64_0')
+
+	os_label = re.search(r"set OS_LABEL to (.*)", stdout)
+	print("os_label in : {}".format(os_label))
+	if os_label is not None:
+		os_label = os_label.group(1)
+		label_str = os_label.split(".")
+		# os_label example: ubuntu.22
+		try:
+			ver = int(label_str[1],10)
+			if label_str[0] == "ubuntu":
+				if ver >= 22:
+					passed.add('test_os_linux_ubuntu22_0')
+				if ver >= 20:
+					passed.add('test_os_linux_ubuntu20plus_0')
+					passed.add('test_os_linux_ubuntu20plus_rhel8plus_0')
+				if ver < 20:
+					passed.add('test_not_os_linux_ubuntu20plus_0')
+
+			if label_str[0] == "rhel":
+				if ver >= 8:
+					passed.add('test_os_linux_ubuntu20plus_rhel8plus_0')
+		except ValueError as ve:
+			print ("warning: os version value failed to convert to an integer")
+			passed.add('test_not_os_linux_ubuntu20plus_0')
+	else:
+		passed.add('test_not_os_linux_ubuntu20plus_0')
+
+	if 'test_os_linux_ubuntu20plus_0' not in passed:
+		skipped.add('test_os_linux_ubuntu20plus_0')
+
+	if 'test_os_linux_ubuntu22_0' not in passed:
+		skipped.add('test_os_linux_ubuntu22_0')
+
+	if 'test_os_linux_ubuntu20plus_rhel8plus_0' not in passed:
+		skipped.add('test_os_linux_ubuntu20plus_rhel8plus_0')
+
+	if 'test_not_os_linux_ubuntu20plus_0' not in passed:
+		skipped.add('test_not_os_linux_ubuntu20plus_0')
+
+	micro_arch = re.search(r"set MICROARCH to (.*)", stdout)
+	# micro_arch = "set MICROARCH to z14"
+	print("micro_arch in platform req: {}".format(micro_arch))
+	pattern = r"set MICROARCH to (.*)"
+	# micro_arch = re.search(pattern, micro_arch)
+	if micro_arch is not None:
+		print(micro_arch)
+		micro_arch = micro_arch.group(1)
+		label_str = micro_arch
+		print("Label_str:",label_str)
+		# micro_arch example: skylake
+		try:
+			ver = int(''.join(filter(str.isdigit, micro_arch.split()[-1])))
+			print("ver:",ver)
+			if label_str == "skylake":
+				passed.add('test_arch_x86_skylake_0')
+			if ver == 13:
+				passed.add('test_arch_390_z13_0')
+			elif ver > 13:
+				passed.add('test_arch_390_z13plus_0')
+			if ver == 14:
+				passed.add('test_arch_390_z14_0')
+			elif ver > 14:
+				passed.add('test_arch_390_z14plus_0')
+			if ver == 15:
+				passed.add('test_arch_390_z15_0')
+			elif ver > 15:
+				passed.add('test_arch_390_z15plus_0')
+			else:
+				skipped.add('test_not_arch_390_0')
+		except ValueError as ve:
+			print("warning: microarch version value failed to convert to an integer")
+			skipped.add('test_not_arch_390_0')
+	else:
+		passed.add('test_not_arch_390_0')
+
+	if 'test_arch_390_z15_0' not in passed:
+		skipped.add('test_arch_390_z15_0')
+
+	if 'test_arch_390_z14_0' not in passed:
+		skipped.add('test_arch_390_z14_0')
+
+	if 'test_arch_390_z13_0' not in passed:
+		skipped.add('test_arch_390_z13_0')
+
+	if 'test_arch_390_z15plus_0' not in passed:
+		skipped.add('test_arch_390_z15plus_0')
+
+	if 'test_arch_390_z14plus_0' not in passed:
+		skipped.add('test_arch_390_z14plus_0')
+
+	if 'test_arch_390_z13plus_0' not in passed:
+		skipped.add('test_arch_390_z13plus_0')
+
+	if 'test_arch_x86_skylake_0' not in passed:
+		skipped.add('test_arch_x86_skylake_0')
+
+
+	rt &= checkResult(result, passed, set(), set(), skipped)
+	return rt
 
 if __name__ == "__main__":
-    run_test()
\ No newline at end of file
+	run_test()
\ No newline at end of file
diff --git a/src/org/openj9/envInfo/MachineInfo.java b/src/org/openj9/envInfo/MachineInfo.java
index 94151154..4ee164e6 100644
--- a/src/org/openj9/envInfo/MachineInfo.java
+++ b/src/org/openj9/envInfo/MachineInfo.java
@@ -38,7 +38,8 @@ public class MachineInfo {
 	public static final String[] LINUX_OS_NAME_CMD = new String[] {"bash", "-c", "grep '^NAME' /etc/os-release | awk -F'=' ' gsub(/\"/,\"\") { print $2}'"};
 	public static final String[] LINUX_OS_VERSION_CMD = new String[] {"bash", "-c", "grep '^VERSION_ID' /etc/os-release | awk -F'=' ' gsub(/\"/,\"\") { print $2}'"};
 
-	public static final String[] MICRO_ARCH_CMD = new String[] {"bash", "-c", "cat /proc/cpuinfo | grep 'model name' | uniq"};
+	public static final String[] MICRO_ARCH_CMD = new String[] {"bash", "-c", "cat /proc/cpuinfo | grep -E 'machine|model name' | uniq"};
+
 	public static final String[] ULIMIT_CMD = new String[] {"bash", "-c", "ulimit -a"};
 
 	public static final String[] INSTALLED_MEM_CMD = new String[] {"bash", "-c", "grep MemTotal /proc/meminfo | awk '{print $2}"};
@@ -116,8 +117,8 @@ public String toString() {
 	}
 
 	private String parseInfo(String output) {
-		if (output == null) return ""; 
-		Pattern pattern = Pattern.compile("[0-9]+[.][0-9]+([.][0-9]+)?"); 
+		if (output == null) return "";
+		Pattern pattern = Pattern.compile("[0-9]+[.][0-9]+([.][0-9]+)?");
 		Matcher matcher = pattern.matcher(output);
 		if (matcher.find()) {
 			return matcher.group(0);
@@ -201,15 +202,36 @@ private void getSysInfo() {
 		putInfo(new Info("sysArch", SYS_ARCH_CMD, ce.execute(SYS_ARCH_CMD), null));
 		putInfo(new Info("procArch", PROC_ARCH_CMD, ce.execute(PROC_ARCH_CMD), null));
 		String microArchOutput = ce.execute(MICRO_ARCH_CMD);
+		String microArch = "";
+		// Check for specific machine versions and set the microArch accordingly
 		if (microArchOutput.toLowerCase().contains("skylake")) {
-			String microArch = "skylake";
+			microArch = "skylake";
+		} else if (microArchOutput.contains("8562")) {
+			microArch = "z15";
+		} else if (microArchOutput.contains("8561")) {
+			microArch = "z15";
+		} else if (microArchOutput.contains("3907")) {
+			microArch = "z14";
+		} else if (microArchOutput.contains("3906")) {
+			microArch = "z14";
+		} else if (microArchOutput.contains("2965")) {
+			microArch = "z13";
+		} else if (microArchOutput.contains("2964")) {
+			microArch= "z13";
+		}
+		else {
+			System.out.println("Unfamiliar microArch detected in TKG. It will not be added in TKG microArch!");
+			System.out.println("microArchOutput: " + microArchOutput);
+	 	}
+
+		if (!microArch.isEmpty()) {
 			putInfo(new Info("microArch", MICRO_ARCH_CMD, microArch, null));
 		}
 		putInfo(new Info("sysOS", SYS_OS_CMD, ce.execute(SYS_OS_CMD), null));
 		putInfo(new Info("ulimit", ULIMIT_CMD, ce.execute(ULIMIT_CMD), null));
 		putInfo(new Info("docker", CHECK_DOCKER_CMD, ce.execute(CHECK_DOCKER_CMD), null));
 	}
-	
+
 	private void getOsLabel() {
 		if (System.getProperty("os.name").toLowerCase().contains("linux")) {
 			String osName = ce.execute(LINUX_OS_NAME_CMD).toLowerCase();
@@ -231,7 +253,7 @@ private void getOsLabel() {
 			putInfo(new Info("osInfo", LINUX_OS_CMD, ce.execute(LINUX_OS_CMD), null));
 		}
 	}
- 
+
 	private void getPrerequisiteInfo() {
 		putInfo(new Info("antVersion", ANT_VERSION_CMD, ce.execute(ANT_VERSION_CMD), "1.9.6"));
 		/* required version is 4.1, but some exception applies, do not verify for now*/
@@ -252,7 +274,7 @@ private void getRuntimeInfo() {
 		putInfo(new Info("vmVendor", new String[] {"ManagementFactory.getRuntimeMXBean().getSpecVendor()"}, ManagementFactory.getRuntimeMXBean().getSpecVendor(), null));
 		putInfo(new Info("vmVersion", new String[] {"ManagementFactory.getRuntimeMXBean().getVmVersion()"}, ManagementFactory.getRuntimeMXBean().getVmVersion(), null));
 	}
-	
+
 	private void getPhysicalMemoryInfo() {
 		OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
 		putInfo(new Info("Total Physical Memory Size", new String[] {"osBean.getTotalPhysicalMemorySize()"}, String.valueOf(osBean.getTotalPhysicalMemorySize()), null));
diff --git a/src/org/testKitGen/TestInfoParser.java b/src/org/testKitGen/TestInfoParser.java
index df0b7c67..93eb652d 100644
--- a/src/org/testKitGen/TestInfoParser.java
+++ b/src/org/testKitGen/TestInfoParser.java
@@ -15,6 +15,7 @@
 package org.testKitGen;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -412,7 +413,6 @@ private boolean checkPlatformReq(List<String> platformRequirementsList) {
 				}
 				String spec = arg.getSpec();
 				String fullSpec = spec;
-
 				// Special case 32/31-bit specs which do not have 32 or 31 in the name (i.e.
 				// aix_ppc)
 				if (!spec.contains("-64")) {
@@ -442,14 +442,13 @@ private boolean matchPlat(String fullSpec, String pr) {
 		if (!fullSpec.contains(prSplitOnDot[1])) {
 			return false;
 		}
-
 		if (prSplitOnDot[0].equals("arch") && (prSplitOnDot.length == 3)) {
-			String microArch = prSplitOnDot[2];
-			if (!microArch.equals(arg.getMicroArch())) {
-				return false;
-			}
+			String requiredMicroArch = prSplitOnDot[2];
+			String actualMicroArch = arg.getMicroArch();
+			return compareVersion(requiredMicroArch, actualMicroArch);
 		} else if (prSplitOnDot[0].equals("os") && (prSplitOnDot.length == 4)) {
 			String osName = prSplitOnDot[2];
+			String osVersion = prSplitOnDot[3];
 			if (arg.getOsLabel().isEmpty()) {
 				return false;
 			}
@@ -457,31 +456,42 @@ private boolean matchPlat(String fullSpec, String pr) {
 			if (!osLabelArg[0].equals(osName)) {
 				return false;
 			}
-			String osVersion = prSplitOnDot[3];
-			if (osVersion.endsWith("+")) {
-				int verInt = 0;
-				try {
-					verInt = Integer.parseInt(osVersion.substring(0, osVersion.length() - 1));
-				} catch (NumberFormatException e) {
-					System.out.println("Error: unrecognized platformRequirement: " + prSplitOnDot + ". Only support integer OS version.");
-					System.exit(1);
-				}
-				int argVerInt = 0;
+			return compareVersion(osVersion, osLabelArg[1]);
+		}
+		return true;
+	}
+
+	private boolean compareVersion(String requiredLabel, String actualLabel) {
+		if (requiredLabel.isEmpty() || actualLabel.isEmpty()) {
+			return false;
+		} else if (requiredLabel.equals(actualLabel)) {
+			return true;
+		} else if (requiredLabel.endsWith("+")) {
+			Pattern pattern = Pattern.compile("(\\D+)?(\\d+)");
+			Matcher requiredLabelMatcher = pattern.matcher(requiredLabel);
+			Matcher actualLabelMatcher = pattern.matcher(actualLabel);
+
+		  if (requiredLabelMatcher.find() && actualLabelMatcher.find()) {
+			String requiredPrefix = requiredLabelMatcher.group(1) != null ? requiredLabelMatcher.group(1) : "";
+	   		String actualPrefix = actualLabelMatcher.group(1) != null ? actualLabelMatcher.group(1) : "";
+			if (requiredPrefix.equals(actualPrefix)) {
+				int requiredLabelNum = 0;
+				int actualLabelNum = 0;
 				try {
-					argVerInt = Integer.parseInt(osLabelArg[1]);
+				requiredLabelNum = Integer.parseInt(requiredLabelMatcher.group(2));
+				actualLabelNum = Integer.parseInt(actualLabelMatcher.group(2));
 				} catch (NumberFormatException e) {
-					System.out.println("Error: unrecognized osLabel: " + arg.getOsLabel() + ". Only support integer OS version.");
-					System.exit(1);
-				}
-				if (verInt > argVerInt) {
-					return false;
+				System.out.println("Error: unrecognized requiredLabel:" + requiredLabel + " or actualLabel:" + actualLabel);
+				System.err.println(e.getMessage());
+				System.exit(1);
 				}
-			} else {
-				if (!osLabelArg[1].equals(osVersion)) {
-					return false;
+				if (actualLabelNum >= requiredLabelNum) {
+					return true;
 				}
 			}
+		  }
 		}
-		return true;
-	}
+		return false;
+	  }
+
 }

From bc04ef1ec52f9b1d4dfe6c9c027073033a7cc65a Mon Sep 17 00:00:00 2001
From: KONNO Kazuhiro <33821890+knn-k@users.noreply.github.com>
Date: Wed, 17 Apr 2024 10:47:07 +0900
Subject: [PATCH 37/45] Disable Modes 155, 159, 198, and 199 on AArch64 Linux
 (#531)

This commit disables Modes 155, 159, 198, and 199 on AArch64 Linux.

Fixes: #529

Signed-off-by: KONNO Kazuhiro <konno@jp.ibm.com>
---
 resources/ottawa.csv | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/ottawa.csv b/resources/ottawa.csv
index 63bdca7b..ec6b64b1 100644
--- a/resources/ottawa.csv
+++ b/resources/ottawa.csv
@@ -59,11 +59,11 @@ variation:Mode150-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no
 variation:Mode152,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes,yes,yes,yes,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
 variation:Mode153,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode154,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,no,no,no,no,no,no,yes,yes,no,no,no,yes,yes,yes,yes,no,no,yes,yes,no,yes,yes,yes,no,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode155,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,yes,yes
+variation:Mode155,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode156,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode157,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode158,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
-variation:Mode159,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,yes,no,no,yes,yes
+variation:Mode159,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,yes,yes
 variation:Mode159-CS,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,no,no,yes,yes
 variation:Mode166,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode167,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
@@ -88,8 +88,8 @@ variation:Mode192,no,no,yes,yes,no,no,yes,yes,no,no,yes,yes,no,yes,yes,no,no,yes
 variation:Mode193,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode194,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,yes,yes,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode195,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,yes,no,no,no,yes,yes,yes,yes
-variation:Mode198,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,yes,yes
-variation:Mode199,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes,no,no,no,no,no,yes,yes
+variation:Mode198,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
+variation:Mode199,no,no,yes,yes,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode200,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode201,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes
 variation:Mode202,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,no,yes,yes

From fbaa03fc4000a1405dcf24f153586d0c5b0b0ef4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 18:07:39 +0000
Subject: [PATCH 38/45] Bump actions/upload-artifact from 4.3.1 to 4.3.2

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/5d5d22a31266ced268874388b861e4b58bb5c2f3...1746f4ab65b179e0ea60a494b83293b640dd5bba)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 43e2a6f1..3c20fda3 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@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+    - uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
       if: failure()
       with:
         name: test_output

From 41c3581c810f2073908cd74ebd2050d37a72cdcb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 12:40:19 -0400
Subject: [PATCH 39/45] Bump actions/checkout from 4.1.2 to 4.1.3 (#537)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3.
- [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/9bb56186c3b09b4f86b1c65136769dd318469633...1d96c772d19495a3b5c517cd2bc0cb401ea0529f)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 2fce3c08..69a78fd2 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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml
index 3c20fda3..24779383 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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       with:
         path: 'main'
     - name: Parse parameters
@@ -107,7 +107,7 @@ jobs:
         sourceType: 'buildType'
         impl: ${{ matrix.jdk_impl }}
     - name: Checkout PR Ref
-      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       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 6027b323..55c28f37 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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
 

From b685034d788aef7dd922089095981fe0ebdf8d8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 18:07:10 +0000
Subject: [PATCH 40/45] Bump actions/checkout from 4.1.3 to 4.1.4

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4.
- [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/1d96c772d19495a3b5c517cd2bc0cb401ea0529f...0ad4b8fadaa221de15dcec353f45205ec38ea70b)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@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 69a78fd2..acbbd43d 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@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml
index 24779383..353be567 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@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       with:
         path: 'main'
     - name: Parse parameters
@@ -107,7 +107,7 @@ jobs:
         sourceType: 'buildType'
         impl: ${{ matrix.jdk_impl }}
     - name: Checkout PR Ref
-      uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       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 55c28f37..1bb7f18e 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@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
 

From 9d8842a30269e9d1ae75e67881e3b29c54edaea4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Apr 2024 10:38:10 +0100
Subject: [PATCH 41/45] Bump actions/upload-artifact from 4.3.2 to 4.3.3 (#538)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/1746f4ab65b179e0ea60a494b83293b640dd5bba...65462800fd760344b1a7b4382951275a0abb4808)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 24779383..612fabe5 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@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
+    - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       if: failure()
       with:
         name: test_output

From 28c7f761d9d2e60043930c1d699ad79c72c2a29c Mon Sep 17 00:00:00 2001
From: Lan Xia <Lan_Xia@ca.ibm.com>
Date: Thu, 25 Apr 2024 17:38:01 -0400
Subject: [PATCH 42/45] Add -Dfile.encoding=IBM-1047 for JDK21 zOS

Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
---
 makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/makefile b/makefile
index ef414113..789f3107 100644
--- a/makefile
+++ b/makefile
@@ -38,9 +38,18 @@ endif
 
 UNAME := uname
 UNAME_OS := $(shell $(UNAME) -s | cut -f1 -d_)
+$(info UNAME_OS is $(UNAME_OS))
 ifeq ($(findstring CYGWIN,$(UNAME_OS)), CYGWIN)
 	LIB_DIR:=$(shell cygpath -w $(LIB_DIR))
+else ifeq ($(UNAME_OS),OS/390)
+# The issue is still being investigated. See backlog/issues/1424
+# set -Dfile.encoding=IBM-1047 for JDK21+ zOS for now
+ifeq ($(shell test $(JDK_VERSION) -ge 21; echo $$?),0)
+export IBM_JAVA_OPTIONS="-Dfile.encoding=IBM-1047"
+$(info export IBM_JAVA_OPTIONS="-Dfile.encoding=IBM-1047")
 endif
+endif
+
 export LIB_DIR:=$(subst \,/,$(LIB_DIR))
 $(info LIB_DIR is set to $(LIB_DIR))
 

From b44106b602fdd7ca082d07280caed917a6e7e987 Mon Sep 17 00:00:00 2001
From: Lan Xia <Lan_Xia@ca.ibm.com>
Date: Thu, 2 May 2024 16:20:17 -0400
Subject: [PATCH 43/45] Use jtreg 7.3.1+1 for JDK11 tests

Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
---
 scripts/getDependencies.pl  |  7 -------
 scripts/getDependencies.xml | 16 +---------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
index b8d2b94b..5623d968 100644
--- a/scripts/getDependencies.pl
+++ b/scripts/getDependencies.pl
@@ -160,13 +160,6 @@
 		shafn => 'jtreg_5_1_b01.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_3_1_1 => {
 		url => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtreg-7.3.1+1.tar.gz',
 		fname => 'jtreg_7_3_1_1.tar.gz',
diff --git a/scripts/getDependencies.xml b/scripts/getDependencies.xml
index 6b6c65b2..c5146362 100644
--- a/scripts/getDependencies.xml
+++ b/scripts/getDependencies.xml
@@ -29,22 +29,8 @@
 			<then>
 				<property name="jtregTar" value="jtreg_5_1_b01"/>
 			</then>
-			<elseif>
-				<!-- version 11 -->
-				<matches pattern="^11$" string="${JDK_VERSION}"/>
-				<then>
-					<property name="jtregTar" value="jtreg_6_1"/>
-				</then>
-			</elseif>
-			<elseif>
-				<!-- versions 17, 21, 22, 23 -->
-				<matches pattern="^(17|2[123])$" string="${JDK_VERSION}"/>
-				<then>
-					<property name="jtregTar" value="jtreg_7_3_1_1"/>
-				</then>
-			</elseif>
 			<else>
-				<fail message="Unsupported JDK version: ${JDK_VERSION}"/>
+				<property name="jtregTar" value="jtreg_7_3_1_1"/>
 			</else>
 		</if>
 

From 59a3d9a2f5dd1f8d8de6de6edbb80dc26442e297 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Mon, 6 May 2024 14:44:06 -0400
Subject: [PATCH 44/45] Adding failed test cases to console

Make failed test cases visible to TRSS

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 scripts/resultsSum.pl | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/resultsSum.pl b/scripts/resultsSum.pl
index 3ba19eae..92bd95cf 100755
--- a/scripts/resultsSum.pl
+++ b/scripts/resultsSum.pl
@@ -171,11 +171,6 @@ sub resultReporter {
 					} elsif ($result eq ($testName . "_FAILED\n")) {
 						$numOfFailed++;
 						$numOfTotal++;
-						my $summarySuffix = '';
-						if ( $testCasesPerTargetSummary ) {
-							$summarySuffix = " - " . $testCasesPerTargetSummary . " ";
-						}
-						push (@failed, $testName . $summarySuffix . $successRate);
 						$tapString .= "not ok " . $numOfTotal . " - " . $testName .  "\n";
 						$tapString .= "  ---\n";
 						# sometime jck test output shows after _FAILED message and before the $testName\E Finish Time
@@ -197,12 +192,11 @@ sub resultReporter {
 								}
 							}
 						}
-
+						my $failureTests = "";
 						if ($diagnostic ne 'failure' || ($buildList !~ /openjdk/ && $buildList !~ /jck/)) {
 							$tapString .= $output;
 						} else { #rerun jdk or jck* custom target only work for diagnostic=failure
 							my @lines = split('\\n', $output);
-							my $failureTests = "";
 							if ($buildList =~ /openjdk/) {
 								for my $i (0 .. $#lines) {
 									if ( $lines[$i] =~ /[-]{50}/) {
@@ -243,6 +237,17 @@ sub resultReporter {
 							moveTDUMPS($output, $dmpDir, $spec);
 						}
 
+						my $summarySuffix = '';
+						if ( $testCasesPerTargetSummary ) {
+							$summarySuffix = " - " . $testCasesPerTargetSummary . " ";
+							$testCasesPerTargetSummary .= "\n";
+							$failureTests =~ s/$testCasesPerTargetSummary//;
+							$failureTests =~ s/        /\t\t\t/;
+							chomp($failureTests);
+							$summarySuffix .= "\n\t\t" . "Failed test cases: \n" . "$failureTests";
+						}
+
+						push (@failed, $testName . $summarySuffix . $successRate);
 						if ( $isJckFailedTestFinish ) {
 							last;
 						}

From f0d3a120b2d031c173ad9304f174b4f4400a3c23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 09:44:46 -0400
Subject: [PATCH 45/45] Bump actions/checkout from 4.1.4 to 4.1.5 (#544)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5.
- [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/0ad4b8fadaa221de15dcec353f45205ec38ea70b...44c2b7a8a4ea60a981eaca3cf939b5f4305c123b)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 acbbd43d..644c664c 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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml
index 3a632a3c..1208fa5d 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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       with:
         path: 'main'
     - name: Parse parameters
@@ -107,7 +107,7 @@ jobs:
         sourceType: 'buildType'
         impl: ${{ matrix.jdk_impl }}
     - name: Checkout PR Ref
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       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 1bb7f18e..055d1489 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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head