Add jdk vendor in TKG

envSettings.mk

@@ -40,22 +40,30 @@ ifneq ($(AUTO_DETECT), false)
     endif
 
     ifndef JDK_VERSION
-		export JDK_VERSION:=$(DETECTED_JDK_VERSION)
+        export JDK_VERSION:=$(DETECTED_JDK_VERSION)
     else
         ifneq ($(JDK_VERSION), $(DETECTED_JDK_VERSION))
             $(error DETECTED_JDK_VERSION value is $(DETECTED_JDK_VERSION), settled JDK_VERSION value is $(JDK_VERSION). JDK_VERSION value does not match. Please reset or unset JDK_VERSION)
         endif
     endif
 
     ifndef JDK_IMPL
-		export JDK_IMPL:=$(DETECTED_JDK_IMPL)
+        export JDK_IMPL:=$(DETECTED_JDK_IMPL)
     else
         ifneq ($(JDK_IMPL), $(DETECTED_JDK_IMPL))
             ifneq ($(JDK_IMPL), sap)
                 $(error DETECTED_JDK_IMPL value is $(DETECTED_JDK_IMPL), settled JDK_IMPL value is $(JDK_IMPL). JDK_IMPL value does not match. Please reset or unset JDK_IMPL)
-	        endif
-	    endif
-	endif
+            endif
+        endif
+    endif
+
+    ifndef JDK_VENDOR
+        export JDK_VENDOR:=$(DETECTED_JDK_VENDOR)
+    else
+        ifneq ($(JDK_VENDOR), $(DETECTED_JDK_VENDOR))
+            $(error DETECTED_JDK_VENDOR value is $(DETECTED_JDK_VENDOR), settled JDK_VENDOR value is $(JDK_VENDOR). JDK_VENDOR value does not match. Please reset or unset JDK_VENDOR)
+        endif
+    endif
 else
     ifndef SPEC
         $(error Please export AUTO_DETECT=true or export SPEC value manually (i.e., export SPEC=linux_x86-64_cmprssptrs))
@@ -66,5 +74,8 @@ else
     ifndef JDK_IMPL
         $(error Please export AUTO_DETECT=true or export JDK_IMPL value manually (i.e., export JDK_IMPL=openj9))
     endif
+    ifndef JDK_VENDOR
+        $(error Please export AUTO_DETECT=true or export JDK_VENDOR value manually (i.e., export JDK_VENDOR=adoptopenjdk))
+    endif
 endif
 

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) --jdkVersion=$(JDK_VERSION) --impl=$(JDK_IMPL) --buildList=${BUILD_LIST} --iterations=$(TEST_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) --jdkVersion=$(JDK_VERSION) --impl=$(JDK_IMPL) --vendor=$(Q)$(JDK_VENDOR)$(Q) --buildList=${BUILD_LIST} --iterations=$(TEST_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)

scripts/resultsSum.pl

@@ -27,6 +27,7 @@
 my $diagnostic = 'failure';
 my $jdkVersion = "";
 my $jdkImpl = "";
+my $jdkVendor = "";
 my $buildList = "";
 my $spec = "";
 my $customTarget = "";
@@ -47,6 +48,8 @@
 		($jdkVersion) = $arg =~ /^\-\-jdkVersion=(.*)/;
 	} elsif ($arg =~ /^\-\-jdkImpl=/) {
 		($jdkImpl) = $arg =~ /^\-\-jdkImpl=(.*)/;
+	} elsif ($arg =~ /^\-\-jdkVendor=/) {
+		($jdkVendor) = $arg =~ /^\-\-jdkVendor=(.*)/;
 	} elsif ($arg =~ /^\-\-buildList=/) {
 		($buildList) = $arg =~ /^\-\-buildList=(.*)/;
 	} elsif ($arg =~ /^\-\-spec=/) {
@@ -237,8 +240,12 @@ sub resultReporter {
 		if ((!defined $hudsonUrl) || ($hudsonUrl eq '')) {
 			$hudsonUrl = "https://ci.adoptopenjdk.net/";
 		}
+		my $vendorParam =  "";
+		if ($jdkVendor ne '') {
+			$vendorParam = "&JDK_VENDOR=" . $jdkVendor;
+		}
 
-		my $rebuildLinkBase = "parambuild/?JDK_VERSION=$jdkVersion&JDK_IMPL=$jdkImpl$buildParam$platformParam$customTargetParam";
+		my $rebuildLinkBase = "parambuild/?JDK_VERSION=$jdkVersion&JDK_IMPL=$jdkImpl$vendorParam$buildParam$platformParam$customTargetParam";
 		print "To rebuild the failed test in a jenkins job, copy the following link and fill out the <Jenkins URL> and <FAILED test target>:\n";
 		print "<Jenkins URL>/$rebuildLinkBase&TARGET=<FAILED test target>\n\n";
 		print "For example, to rebuild the failed tests in <Jenkins URL>=${hudsonUrl}job/Grinder, use the following links:\n";

settings.mk

@@ -77,6 +77,7 @@ else
 	export JDK_IMPL:=$(JDK_IMPL)
 endif
 
+export JDK_VENDOR:=$(JDK_VENDOR)
 
 ifndef JVM_VERSION
 	OPENJDK_VERSION = openjdk$(JDK_VERSION)
@@ -317,4 +318,4 @@ rmResultFile:
 
 resultsSummary:
 	$(CD) $(Q)$(TEST_ROOT)$(D)TKG$(D)scripts$(Q); \
-	perl $(Q)resultsSum.pl$(Q) --failuremk=$(Q)$(FAILEDTARGETS)$(Q) --resultFile=$(Q)$(TEMPRESULTFILE)$(Q) --tapFile=$(Q)$(TAPRESULTFILE)$(Q) --platFile=$(Q)$(PLATFROMFILE)$(Q) --diagnostic=$(DIAGNOSTICLEVEL) --jdkVersion=$(JDK_VERSION) --jdkImpl=$(JDK_IMPL) --spec=$(SPEC) --buildList=$(BUILD_LIST) --customTarget=$(CUSTOM_TARGET)
+	perl $(Q)resultsSum.pl$(Q) --failuremk=$(Q)$(FAILEDTARGETS)$(Q) --resultFile=$(Q)$(TEMPRESULTFILE)$(Q) --tapFile=$(Q)$(TAPRESULTFILE)$(Q) --platFile=$(Q)$(PLATFROMFILE)$(Q) --diagnostic=$(DIAGNOSTICLEVEL) --jdkVersion=$(JDK_VERSION) --jdkImpl=$(JDK_IMPL) --jdkVendor=$(Q)$(JDK_VENDOR)$(Q) --spec=$(SPEC) --buildList=$(BUILD_LIST) --customTarget=$(CUSTOM_TARGET)

src/org/openj9/envInfo/EnvDetector.java

@@ -48,6 +48,7 @@ private static void parseArgs(String[] args) {
 	private static void getJavaInfo() {
 		JavaInfo envDetection = new JavaInfo();
 		String javaImplInfo = envDetection.getJDKImpl();
+		String vendorInfo = envDetection.getJDKVendor();
 		String SPECInfo = envDetection.getSPEC(javaImplInfo);
 		int javaVersionInfo = envDetection.getJDKVersion();
 		if (SPECInfo == null || javaVersionInfo == -1 || javaImplInfo == null) {
@@ -56,6 +57,7 @@ private static void getJavaInfo() {
 		String SPECvalue = "DETECTED_SPEC=" + SPECInfo + "\n";
 		String JDKVERSIONvalue = "DETECTED_JDK_VERSION=" + javaVersionInfo + "\n";
 		String JDKIMPLvalue = "DETECTED_JDK_IMPL=" + javaImplInfo + "\n";
+		String JDKVENDORvalue = "DETECTED_JDK_VENDOR=" + vendorInfo + "\n";
 
 		/**
 		 * autoGenEnv.mk file will be created to store auto detected java info.
@@ -69,6 +71,7 @@ private static void getJavaInfo() {
 			output.write(SPECvalue);
 			output.write(JDKVERSIONvalue);
 			output.write(JDKIMPLvalue);
+			output.write(JDKVENDORvalue);
 			output.close();
 		} catch (IOException e) {
 			e.printStackTrace();

src/org/openj9/envInfo/JavaInfo.java

@@ -126,4 +126,33 @@ public String getJDKImpl() {
             return null;
         }
     }
+
+    public String getJDKVendor() {
+        String vendor = System.getProperty("java.vendor");
+        System.out.println("System.getProperty('java.vendor')=" + vendor + "\n");
+        String vendorLC = vendor.toLowerCase();
+        if (vendorLC.contains("adoptopenjdk")) {
+            return "adoptopenjdk";
+        } else if (vendorLC.contains("eclipse")) {
+            return "eclipse";
+        } else if (vendorLC.contains("ibm")) {
+            return "ibm";
+        } else if (vendorLC.contains("alibaba")) {
+            return "alibaba";
+        } else if (vendorLC.contains("amazon")) {
+            return "amazon";
+        } else if (vendorLC.contains("azul")) {
+            return "azul";
+        }  else if (vendorLC.contains("sap")) {
+            return "sap";
+        } else if (vendorLC.contains("bellsoft")) {
+            return "bellsoft";
+        } else if (vendorLC.contains("oracle")) {
+            return "oracle";
+        } else {
+            System.out.println("Warning: cannot determine vendor, use System.getProperty('java.vendor')=" + vendor + " directly.\n");
+            return vendor;
+        }
+    }
+
 }

src/org/testKitGen/Arguments.java

@@ -29,6 +29,7 @@ enum Mode {
 	private String jdkVersion = "";
 	private String impl = "";
 	private String buildImpl = "";
+	private String vendor = "";
 	private String projectRootDir = System.getProperty("user.dir") + "/..";
 	private String buildList = "";
 	private String iterations = "";
@@ -48,6 +49,7 @@ enum Mode {
 			+ "                              Defaults to tests\n"
 			+ "    --jdkVersion=<version>    JDK version that the build will run on, e.g. 8, 9, 10, etc.\n"
 			+ "    --impl=<implementation>   Java implementation, e.g. openj9, ibm, hotspot, sap\n"
+			+ "    --vendor=<jdk vendor>     Java vendor information, e.g. adoptopenjdk, ibm\n"
 			+ "    --projectRootDir=<path>   Root path for searching playlist.xml\n"
 			+ "                              Defaults to the parent folder of TKG \n"
 			+ "    --buildList=<paths>       Comma separated project paths (relative to projectRootDir) to search for playlist.xml\n"
@@ -100,6 +102,10 @@ public String getBuildImpl() {
 		return buildImpl;
 	}
 
+	public String getVendor() {
+		return vendor;
+	}
+
 	public String getProjectRootDir() {
 		return projectRootDir;
 	}
@@ -176,6 +182,8 @@ public void parse(String[] args) {
 				} else if (impl.equals("hotspot")) {
 					buildImpl = "hs";
 				}
+			} else if (arglc.startsWith("--vendor=")) {
+				vendor = arglc.substring(arg.indexOf("=") + 1);
 			} else if (arglc.startsWith("--projectrootdir=")) {
 				// projectRootDir is case sensitive
 				projectRootDir = arg.substring(arg.indexOf("=") + 1);

src/org/testKitGen/TestInfoParser.java

@@ -51,6 +51,12 @@ public TestInfo parse() {
 		}
 		if (!isValidImpl) return null;
 
+		// Do not generate make target if vendor doesn't match the exported jdk_vendor
+		List<String> vendors = new ArrayList<String>();
+		getElements(vendors, "vendors", "vendor", null, ti.getTestCaseName());
+		boolean isValidVendor = (vendors.size() == 0) || vendors.contains(arg.getVendor());
+		if (!isValidVendor) return null;
+
 		// Do not generate make target if subset doesn't match the exported jdk_version
 		NodeList subsets = testEle.getElementsByTagName("subset");
 
@@ -200,7 +206,7 @@ private void parseDisableInfo(TestInfo ti) {
 					&& ((variation == null) || var.getVariation().equals(variation))) {
 					var.addDisabledReasons(comment);
 				}
-			} 
+			}
 		}
 	}