adding global args

OpenLiberty · Dec 3, 2024 · d789de2 · d789de2
1 parent a1d7275
commit d789de2
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/dev/fattest.simplicity/src/componenttest/topology/impl/LibertyServer.java b/dev/fattest.simplicity/src/componenttest/topology/impl/LibertyServer.java
@@ -1728,7 +1728,7 @@ public ProgramOutput startServerWithArgs(boolean preClean, boolean cleanStart,
         if (isFIPS140_3EnabledAndSupported()) {
             Log.info(c, "startServerWithArgs",
                     "Liberty server is running JDK version: " + info.majorVersion() + " and vendor: " + info.VENDOR);
-            Map<String, String> fipsOpts = getFipsJvmOptions(info);
+            Map<String, String> fipsOpts = getFipsJvmOptions(info, false);
             StringJoiner joiner = new StringJoiner(" ", " ", "");
             for (String key : fipsOpts.keySet()) {
                 if (fipsOpts.get(key) != null) {
@@ -8055,10 +8055,10 @@ public void configureLTPAKeys() throws IOException, InterruptedException {
     }
 
     public Map<String, String> getFipsJvmOptions() throws IOException {
-        return getFipsJvmOptions(JavaInfo.forServer(this));
+        return getFipsJvmOptions(JavaInfo.forServer(this), true);
     }
 
-    public Map<String, String> getFipsJvmOptions(JavaInfo info) throws IOException {
+    public Map<String, String> getFipsJvmOptions(JavaInfo info, boolean includeGlobalArgs) throws IOException {
         Map<String, String> opts = new HashMap<>();
         if (isFIPS140_3EnabledAndSupported()) {
             Log.info(c, "getFipsJvmOptions",
@@ -8071,8 +8071,6 @@ public Map<String, String> getFipsJvmOptions(JavaInfo info) throws IOException {
                 opts.put("-Dsemeru.fips", "true");
                 opts.put("-Dsemeru.customprofile", "OpenJCEPlusFIPS.FIPS140-3-withPKCS12");
                 opts.put("-Dcom.ibm.fips.mode", "140-3");
-                // JVM_ARGS += " -Djavax.net.debug=all"; // Uncomment as needed for additional
-                // debugging
             } else if (info.majorVersion() == 8) {
                 Log.info(c, "getFipsJvmOptions", "FIPS 140-3 global build properties is set for server "
                         + getServerName()
@@ -8081,8 +8079,11 @@ public Map<String, String> getFipsJvmOptions(JavaInfo info) throws IOException {
                 opts.put("-Dcom.ibm.jsse2.usefipsprovider", "true");
                 opts.put("-Dcom.ibm.jsse2.usefipsProviderName", "IBMJCEPlusFIPS");
                 opts.put("-Dcom.ibm.fips.mode", "140-3");
-                // JVM_ARGS += " -Djavax.net.debug=all"; // Uncomment as needed for additional
-                // debugging
+
+            }
+            if (includeGlobalArgs) {
+                opts.put("-Dglobal.fips_140-3", "true");
+                opts.put("-Dcom.ibm.ws.beta.edition", "true");
             }
         }
         return opts;