From a24a93d55623b5fad94344da370a3a826d051e95 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 8 Sep 2023 11:07:40 -0400 Subject: [PATCH 01/10] add new java 11 test cases Signed-off-by: ojcelis --- .github/scripts/cicd_test/make_matrix.sh | 12 +++++ .github/workflows/cicd-test-readme.md | 12 +++-- .github/workflows/cicd-test.yml | 17 ++++++- .../java-versions/java11/install-keyring.ts | 50 +++++++++++++++++++ .../java-versions/java11/install-pax.ts | 45 +++++++++++++++++ .../java-versions/java11/install-ptf.ts | 45 +++++++++++++++++ 6 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts create mode 100644 tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts create mode 100644 tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index ac4dfc146b..def82c66ba 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -45,6 +45,18 @@ case $install_test_choice in test_force_system="zzow04" ;; +"z/OS java 11 pax") + test_file="$ZOS_JAVA_11_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" ;; diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index 6e71645572..5867516e2c 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -32,6 +32,9 @@ 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 11 PTF + - z/OS java 11 Keyring - Non-strict Verify External Certificate - Install PTF twice - VSAM Caching storage method @@ -123,10 +126,13 @@ 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 11 PTF | 68m | +| z/OS java 11 Keyring | 53m | | Non-strict Verify External Certificate | 51m | | Extensions | 67m | Zowe Release Tests | ~6hr 15 mins diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 4c4ea7b1d2..6261c77530 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -27,6 +27,9 @@ on: - z/OS node v14 - z/OS node v16 - z/OS node v18 + - z/OS java 11 Pax + - z/OS java 11 PTF + - z/OS java 11 Keyring - Non-strict Verify External Certificate - Install PTF Twice - VSAM Caching Storage Method @@ -78,6 +81,9 @@ 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_11_PAX_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 @@ -85,7 +91,7 @@ env: 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/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 +308,15 @@ jobs: case 'z/OS node v18': eta = 45 break; + case 'z/OS java 11 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; diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts new file mode 100644 index 0000000000..2925ad620e --- /dev/null +++ b/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); + }) + }); + \ No newline at end of file diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts new file mode 100644 index 0000000000..f30440b69d --- /dev/null +++ b/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); + }) + }); + \ No newline at end of file diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts new file mode 100644 index 0000000000..dcd5d6e396 --- /dev/null +++ b/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); + }) + }); + \ No newline at end of file From 78a15385febf95e0ac753201c30b0c4bcaa0cecd Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 8 Sep 2023 11:29:19 -0400 Subject: [PATCH 02/10] update typo Signed-off-by: ojcelis --- .github/workflows/cicd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 6261c77530..10bbe59f74 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -82,7 +82,7 @@ env: 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_11_PAX_TESTFILE: extended/java-versions/java11/install-ptf.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 From e734252ca23217d78548c2f51d5cca0509afcf1f Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 8 Sep 2023 11:55:25 -0400 Subject: [PATCH 03/10] update where to get utils and constants Signed-off-by: ojcelis --- .../extended/java-versions/java11/install-keyring.ts | 4 ++-- .../__tests__/extended/java-versions/java11/install-pax.ts | 4 ++-- .../__tests__/extended/java-versions/java11/install-ptf.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts index 2925ad620e..543380320b 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts @@ -12,11 +12,11 @@ import { checkMandatoryEnvironmentVariables, installAndVerifyConvenienceBuild, showZoweRuntimeLogs, - } from '../../utils'; + } from '../../../utils'; import { TEST_TIMEOUT_CONVENIENCE_BUILD, KEYSTORE_MODE_KEYRING, - } from '../../constants'; + } from '../../../constants'; const testServer = process.env.TEST_SERVER; const testSuiteName = 'Test convenience build installation by enabling VERIFY_CERTIFICATES with java 11'; diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts index f30440b69d..fcc4adb0ca 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts @@ -12,8 +12,8 @@ import { checkMandatoryEnvironmentVariables, installAndVerifyConvenienceBuild, showZoweRuntimeLogs, - } from '../../utils'; - import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../constants'; + } from '../../../utils'; + import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../constants'; const testSuiteName = 'Test convenience build installation with java 11'; describe(testSuiteName, () => { diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts index dcd5d6e396..5b32b2c1e6 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts @@ -12,8 +12,8 @@ import { checkMandatoryEnvironmentVariables, installAndVerifySmpePtf, showZoweRuntimeLogs, - } from '../../utils'; - import { TEST_TIMEOUT_SMPE_PTF } from '../../constants'; + } from '../../../utils'; + import { TEST_TIMEOUT_SMPE_PTF } from '../../../constants'; const testSuiteName = 'Test SMPE PTF installation with java 11'; describe(testSuiteName, () => { From 0447a48a783157787eb750c77d0d18bccf03a782 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 8 Sep 2023 12:08:01 -0400 Subject: [PATCH 04/10] missed the other folder Signed-off-by: ojcelis --- .../extended/java-versions/java11/install-keyring.ts | 4 ++-- .../__tests__/extended/java-versions/java11/install-pax.ts | 4 ++-- .../__tests__/extended/java-versions/java11/install-ptf.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts index 543380320b..5a1063331f 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts @@ -12,11 +12,11 @@ import { checkMandatoryEnvironmentVariables, installAndVerifyConvenienceBuild, showZoweRuntimeLogs, - } from '../../../utils'; + } from '../../../../utils'; import { TEST_TIMEOUT_CONVENIENCE_BUILD, KEYSTORE_MODE_KEYRING, - } from '../../../constants'; + } from '../../../../constants'; const testServer = process.env.TEST_SERVER; const testSuiteName = 'Test convenience build installation by enabling VERIFY_CERTIFICATES with java 11'; diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts index fcc4adb0ca..58c2b81599 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts @@ -12,8 +12,8 @@ import { checkMandatoryEnvironmentVariables, installAndVerifyConvenienceBuild, showZoweRuntimeLogs, - } from '../../../utils'; - import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../constants'; + } from '../../../../utils'; + import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants'; const testSuiteName = 'Test convenience build installation with java 11'; describe(testSuiteName, () => { diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts index 5b32b2c1e6..260619a362 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts @@ -12,8 +12,8 @@ import { checkMandatoryEnvironmentVariables, installAndVerifySmpePtf, showZoweRuntimeLogs, - } from '../../../utils'; - import { TEST_TIMEOUT_SMPE_PTF } from '../../../constants'; + } from '../../../../utils'; + import { TEST_TIMEOUT_SMPE_PTF } from '../../../../constants'; const testSuiteName = 'Test SMPE PTF installation with java 11'; describe(testSuiteName, () => { From 2de4e335b786a07ce6c51bdeee0e8d60354e5824 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 8 Sep 2023 12:41:17 -0400 Subject: [PATCH 05/10] update indentation Signed-off-by: ojcelis --- .../java-versions/java11/install-keyring.ts | 70 +++++++++---------- .../java-versions/java11/install-pax.ts | 64 ++++++++--------- .../java-versions/java11/install-ptf.ts | 58 +++++++-------- .../extended/node-versions/node-v14.ts | 2 +- 4 files changed, 97 insertions(+), 97 deletions(-) diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts index 5a1063331f..30e2651bce 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts @@ -9,42 +9,42 @@ */ import { - checkMandatoryEnvironmentVariables, - installAndVerifyConvenienceBuild, - showZoweRuntimeLogs, - } from '../../../../utils'; - import { - TEST_TIMEOUT_CONVENIENCE_BUILD, - KEYSTORE_MODE_KEYRING, - } from '../../../../constants'; + 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', - ]); - }); +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); + 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); - }) - }); + afterAll(async () => { + await showZoweRuntimeLogs(testServer); + }) +}); \ No newline at end of file diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts index 58c2b81599..c32d240e0d 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts @@ -9,37 +9,37 @@ */ 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); - }) + 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); + }) +}); \ No newline at end of file diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts index 260619a362..96e28c70fb 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts @@ -9,37 +9,37 @@ */ import { - checkMandatoryEnvironmentVariables, - installAndVerifySmpePtf, - showZoweRuntimeLogs, - } from '../../../../utils'; - import { TEST_TIMEOUT_SMPE_PTF } from '../../../../constants'; + checkMandatoryEnvironmentVariables, + installAndVerifySmpePtf, + showZoweRuntimeLogs, +} from '../../../../utils'; +import { TEST_TIMEOUT_SMPE_PTF } from '../../../../constants'; - const testSuiteName = 'Test SMPE PTF installation with java 11'; - describe(testSuiteName, () => { - beforeAll(() => { +const testSuiteName = 'Test SMPE PTF installation with java 11'; +describe(testSuiteName, () => { + beforeAll(() => { // validate variables - checkMandatoryEnvironmentVariables([ - 'TEST_SERVER', - 'ZOWE_BUILD_LOCAL', - ]); - }); + 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); + 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); - }) - }); + afterAll(async () => { + await showZoweRuntimeLogs(process.env.TEST_SERVER); + }) +}); \ No newline at end of file diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts index 00d47e38ab..3e048fce09 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts +++ b/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 From b3f7372f819246319df01da8f70f89f003d1bcab Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 8 Sep 2023 12:55:17 -0400 Subject: [PATCH 06/10] update last lint errors Signed-off-by: ojcelis --- .../__tests__/extended/java-versions/java11/install-pax.ts | 4 ++-- .../__tests__/extended/java-versions/java11/install-ptf.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts index c32d240e0d..bfcd461b8b 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts @@ -20,8 +20,8 @@ describe(testSuiteName, () => { beforeAll(() => { // validate variables checkMandatoryEnvironmentVariables([ - 'TEST_SERVER', - 'ZOWE_BUILD_LOCAL', + 'TEST_SERVER', + 'ZOWE_BUILD_LOCAL', ]); }); diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts index 96e28c70fb..a5d81ebf60 100644 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts +++ b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts @@ -18,7 +18,7 @@ import { TEST_TIMEOUT_SMPE_PTF } from '../../../../constants'; const testSuiteName = 'Test SMPE PTF installation with java 11'; describe(testSuiteName, () => { beforeAll(() => { - // validate variables + // validate variables checkMandatoryEnvironmentVariables([ 'TEST_SERVER', 'ZOWE_BUILD_LOCAL', From cfdf775b891477e42744f70e1599b828ca944af3 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 8 Sep 2023 13:54:56 -0400 Subject: [PATCH 07/10] update make matrix Signed-off-by: ojcelis --- .github/scripts/cicd_test/make_matrix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index def82c66ba..078173899a 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -45,7 +45,7 @@ case $install_test_choice in test_force_system="zzow04" ;; -"z/OS java 11 pax") +"z/OS java 11 Pax") test_file="$ZOS_JAVA_11_PAX_TESTFILE" ;; From 44a8771498ac5f9f2bdb07475196ec65cfa9e5a6 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Fri, 8 Sep 2023 14:46:17 -0400 Subject: [PATCH 08/10] JAVA 17 install pax test Signed-off-by: ojcelis --- .github/scripts/cicd_test/make_matrix.sh | 4 ++ .github/workflows/cicd-test-readme.md | 2 + .github/workflows/cicd-test.yml | 7 ++- .../java-versions/java17/install-pax.ts | 44 +++++++++++++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 tests/installation/src/__tests__/extended/java-versions/java17/install-pax.ts diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index 078173899a..7d76a050ec 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -49,6 +49,10 @@ case $install_test_choice in 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" ;; diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index 5867516e2c..87072ae2c1 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -33,6 +33,7 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin - 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 @@ -131,6 +132,7 @@ Selected test running elapsed time: | 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 | diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 10bbe59f74..edfa6b8a91 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -28,6 +28,7 @@ on: - 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 @@ -82,6 +83,7 @@ env: 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 @@ -91,7 +93,7 @@ env: 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/java-versions/java11/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) + 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: @@ -311,6 +313,9 @@ jobs: 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; diff --git a/tests/installation/src/__tests__/extended/java-versions/java17/install-pax.ts b/tests/installation/src/__tests__/extended/java-versions/java17/install-pax.ts new file mode 100644 index 0000000000..e2b87ce6ee --- /dev/null +++ b/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); + }) +}); From d6774c60b439fe84a571b8c131976510d79be42c Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 10 Dec 2024 14:41:56 -0500 Subject: [PATCH 09/10] remove java 17 and 11+pax tests Signed-off-by: MarkAckert --- .github/scripts/cicd_test/make_matrix.sh | 8 ---- .../java-versions/java11/install-ptf.ts | 45 ------------------- .../java-versions/java17/install-pax.ts | 44 ------------------ 3 files changed, 97 deletions(-) delete mode 100644 tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts delete mode 100644 tests/installation/src/__tests__/extended/java-versions/java17/install-pax.ts diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index 1ddec41efb..e0caf583f8 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -45,14 +45,6 @@ case $install_test_choice in 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" ;; diff --git a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts b/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts deleted file mode 100644 index a5d81ebf60..0000000000 --- a/tests/installation/src/__tests__/extended/java-versions/java11/install-ptf.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * 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); - }) -}); - \ No newline at end of file diff --git a/tests/installation/src/__tests__/extended/java-versions/java17/install-pax.ts b/tests/installation/src/__tests__/extended/java-versions/java17/install-pax.ts deleted file mode 100644 index e2b87ce6ee..0000000000 --- a/tests/installation/src/__tests__/extended/java-versions/java17/install-pax.ts +++ /dev/null @@ -1,44 +0,0 @@ -/** - * 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); - }) -}); From 310c7b56fa02c3ec7ff32f9e1afc8d23cc33951c Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 10 Dec 2024 14:44:17 -0500 Subject: [PATCH 10/10] cleanup some merge issues Signed-off-by: MarkAckert --- .github/workflows/cicd-test-readme.md | 3 --- .github/workflows/cicd-test.yml | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index 5d9b3cf813..d540aead85 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -124,9 +124,6 @@ Selected test running elapsed time: | Convenience Pax | 53m | | SMPE PTF | 68m | | Keyring | 53m | -| z/OS node v14 | 45m | -| z/OS node v16 | 45m | -| z/OS node v18 | 45m | | z/OS node v20 | 45m | | z/OS java 11 Pax | 53m | | z/OS java 11 Keyring | 53m | diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 7eb57324ad..fe46df03eb 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -83,7 +83,6 @@ env: SMPE_PTF_TESTFILE: basic/install-ptf.ts EXTENSIONS_TESTFILE: basic/install-ext.ts KEYRING_TESTFILE: extended/keyring.ts - ZOS_NODE_V18_TESTFILE: extended/node-versions/node-v18.ts ZOS_NODE_V20_TESTFILE: extended/node-versions/node-v20.ts ZOS_JAVA_11_PAX_TESTFILE: extended/java-versions/java11/install-pax.ts ZOS_JAVA_11_KYRNG_TESTFILE: extended/java-versions/java11/install-keyring.ts @@ -94,7 +93,7 @@ env: 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-20.ts(any);extended/node-versions/node-v22.ts(any):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: