Add new extended test cases - Java 11 and 17

.github/scripts/cicd_test/make_matrix.sh

@@ -45,6 +45,22 @@ case $install_test_choice in
   test_force_system="zzow04"
   ;;
 
+"z/OS java 11 Pax")
+  test_file="$ZOS_JAVA_11_PAX_TESTFILE"
+  ;;
+
+"z/OS java 17 Pax")
+  test_file="$ZOS_JAVA_17_PAX_TESTFILE"
+  ;;
+
+"z/OS java 11 PTF")
+  test_file="$ZOS_JAVA_11_PTF_TESTFILE"
+  ;;
+
+"z/OS java 11 Keyring")
+  test_file="$ZOS_JAVA_11_KYRNG_TESTFILE"
+  ;;
+
 "Non-strict Verify External Certificate")
   test_file="$NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE"
   ;;

.github/workflows/cicd-test-readme.md

@@ -32,6 +32,10 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin
   - z/OS node v14
   - z/OS node v16
   - z/OS node v18
+  - z/OS java 11 Pax
+  - z/OS java 17 Pax
+  - z/OS java 11 PTF
+  - z/OS java 11 Keyring
   - Non-strict Verify External Certificate
   - Install PTF twice
   - VSAM Caching storage method
@@ -123,10 +127,14 @@ Selected test running elapsed time:
 | ---- | ------------ |
 | Convenience Pax | 53m |
 | SMPE PTF | 68m |
-| z/OS node v18 | 45m |
-| z/OS node v16 | 45m |
-| z/OS node v14 | 45m |
 | Keyring | 53m |
+| z/OS node v14 | 45m |
+| z/OS node v16 | 45m |
+| z/OS node v18 | 45m |
+| z/OS java 11 Pax | 53m |
+| z/OS java 17 Pax | 53m |
+| z/OS java 11 PTF | 68m |
+| z/OS java 11 Keyring | 53m |
 | Non-strict Verify External Certificate | 51m |
 | Extensions | 67m
 | Zowe Release Tests | ~6hr 15 mins  

.github/workflows/cicd-test.yml

@@ -27,6 +27,10 @@ on:
           - z/OS node v14
           - z/OS node v16
           - z/OS node v18
+          - z/OS java 11 Pax
+          - z/OS java 17 Pax
+          - z/OS java 11 PTF
+          - z/OS java 11 Keyring
           - Non-strict Verify External Certificate
           - Install PTF Twice
           - VSAM Caching Storage Method
@@ -78,14 +82,18 @@ env:
   ZOS_NODE_V14_TESTFILE: extended/node-versions/node-v14.ts
   ZOS_NODE_V16_TESTFILE: extended/node-versions/node-v16.ts
   ZOS_NODE_V18_TESTFILE: extended/node-versions/node-v18.ts
+  ZOS_JAVA_11_PAX_TESTFILE: extended/java-versions/java11/install-pax.ts
+  ZOS_JAVA_17_PAX_TESTFILE: extended/java-versions/java17/install-pax.ts
+  ZOS_JAVA_11_PTF_TESTFILE: extended/java-versions/java11/install-ptf.ts
+  ZOS_JAVA_11_KYRNG_TESTFILE: extended/java-versions/java11/install-keyring.ts
   NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE: extended/certificates/nonstrict-verify-external-certificate.ts
   INSTALL_PTF_TWICE_TESTFILE: extended/install-ptf-two-times.ts
   VSAM_CACHING_STORAGE_METHOD_TESTFILE: extended/caching-storages/vsam-storage.ts
   INFINISPAN_CACHING_STORAGE_METHOD_TESTFILE: extended/caching-storages/infinispan-storage.ts
   CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts
   GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts
   ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all)
-  ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v14.ts(any);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any)
+  ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v14.ts(any);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04);extended/java-versions/java11/install-pax.ts(any);extended/java-versions/java17/install-pax.ts(any);extended/java-versions/java11/install-ptf.ts(any);extended/java-versions/java11/install-keyring.ts(all);extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any)
 
 jobs:
   display-dispatch-event-id:
@@ -302,6 +310,18 @@ jobs:
               case 'z/OS node v18':
                 eta = 45
                 break;
+              case 'z/OS java 11 Pax':
+                eta = 53
+                break;
+              case 'z/OS java 17 Pax':
+                eta = 53
+                break;
+              case 'z/OS java 11 PTF':
+                eta = 68
+                break;
+              case 'z/OS java 11 Keyring':
+                eta = 53
+                break;q
               case 'Infinispan Caching Storage Method':
                 eta = 51
                 break;

tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts

@@ -0,0 +1,50 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright IBM Corporation 2020
+ */
+
+import {
+  checkMandatoryEnvironmentVariables,
+  installAndVerifyConvenienceBuild,
+  showZoweRuntimeLogs,
+} from '../../../../utils';
+import {
+  TEST_TIMEOUT_CONVENIENCE_BUILD,
+  KEYSTORE_MODE_KEYRING,
+} from '../../../../constants';
+
+const testServer = process.env.TEST_SERVER;
+const testSuiteName = 'Test convenience build installation by enabling VERIFY_CERTIFICATES with java 11';
+describe(testSuiteName, () => {
+  beforeAll(() => {
+    // validate variables
+    checkMandatoryEnvironmentVariables([
+      'TEST_SERVER',
+      'ZOWE_BUILD_LOCAL',
+    ]);
+  });
+
+  test('install and verify', async () => {
+    await installAndVerifyConvenienceBuild(
+      testSuiteName,
+      testServer,
+      {
+        'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
+        'zowe_custom_for_test': 'true',
+        'zos_keystore_mode': KEYSTORE_MODE_KEYRING,
+        'zos_java_home': '/ZOWE/node/J11.0_64',
+        'zowe_lock_keystore': 'false',
+      }
+    );
+  }, TEST_TIMEOUT_CONVENIENCE_BUILD);
+
+  afterAll(async () => {
+    await showZoweRuntimeLogs(testServer);
+  })
+});
+

tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts

@@ -0,0 +1,45 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright IBM Corporation 2020
+ */
+
+import {
+  checkMandatoryEnvironmentVariables,
+  installAndVerifyConvenienceBuild,
+  showZoweRuntimeLogs,
+} from '../../../../utils';
+import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants';
+
+const testSuiteName = 'Test convenience build installation with java 11';
+describe(testSuiteName, () => {
+  beforeAll(() => {
+    // validate variables
+    checkMandatoryEnvironmentVariables([
+      'TEST_SERVER',
+      'ZOWE_BUILD_LOCAL',
+    ]);
+  });
+
+  test('install and verify', async () => {
+    await installAndVerifyConvenienceBuild(
+      testSuiteName,
+      process.env.TEST_SERVER,
+      {
+        'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
+        'zowe_custom_for_test': 'true',
+        'zos_java_home': '/ZOWE/node/J11.0_64',
+        'zowe_lock_keystore': 'false',
+      }
+    );
+  }, TEST_TIMEOUT_CONVENIENCE_BUILD);
+
+  afterAll(async () => {
+    await showZoweRuntimeLogs(process.env.TEST_SERVER);
+  })
+});
+

tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts

@@ -0,0 +1,45 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright IBM Corporation 2020
+ */
+
+import {
+  checkMandatoryEnvironmentVariables,
+  installAndVerifySmpePtf,
+  showZoweRuntimeLogs,
+} from '../../../../utils';
+import { TEST_TIMEOUT_SMPE_PTF } from '../../../../constants';
+
+const testSuiteName = 'Test SMPE PTF installation with java 11';
+describe(testSuiteName, () => {
+  beforeAll(() => {
+    // validate variables
+    checkMandatoryEnvironmentVariables([
+      'TEST_SERVER',
+      'ZOWE_BUILD_LOCAL',
+    ]);
+  });
+
+  test('install and verify', async () => {
+    await installAndVerifySmpePtf(
+      testSuiteName,
+      process.env.TEST_SERVER,
+      {
+        'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
+        'zowe_custom_for_test': 'true',
+        'zos_java_home': '/ZOWE/node/J11.0_64',
+        'zowe_lock_keystore': 'false',
+      }
+    );
+  }, TEST_TIMEOUT_SMPE_PTF);
+
+  afterAll(async () => {
+    await showZoweRuntimeLogs(process.env.TEST_SERVER);
+  })
+});
+

tests/installation/src/__tests__/extended/java-versions/java17/install-pax.ts

@@ -0,0 +1,44 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright IBM Corporation 2020
+ */
+
+import {
+  checkMandatoryEnvironmentVariables,
+  installAndVerifyConvenienceBuild,
+  showZoweRuntimeLogs,
+} from '../../../../utils';
+import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants';
+
+const testSuiteName = 'Test convenience build installation with java 17';
+describe(testSuiteName, () => {
+  beforeAll(() => {
+    // validate variables
+    checkMandatoryEnvironmentVariables([
+      'TEST_SERVER',
+      'ZOWE_BUILD_LOCAL',
+    ]);
+  });
+
+  test('install and verify', async () => {
+    await installAndVerifyConvenienceBuild(
+      testSuiteName,
+      process.env.TEST_SERVER,
+      {
+        'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
+        'zowe_custom_for_test': 'true',
+        'zos_java_home': '/ZOWE/node/J17.0_64',
+        'zowe_lock_keystore': 'false',
+      }
+    );
+  }, TEST_TIMEOUT_CONVENIENCE_BUILD);
+
+  afterAll(async () => {
+    await showZoweRuntimeLogs(process.env.TEST_SERVER);
+  })
+});

tests/installation/src/__tests__/extended/node-versions/node-v14.ts

@@ -16,7 +16,7 @@ import {
 import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants';
 
 const testServer = process.env.TEST_SERVER;
-const testSuiteName = 'Test convenience build installation with node.js v6';
+const testSuiteName = 'Test convenience build installation with node.js v14';
 describe(testSuiteName, () => {
   beforeAll(() => {
     // validate variables