Skip to content

Commit

Permalink
Add new extended test cases - Zowe v2 and Java 11 (#3571)
Browse files Browse the repository at this point in the history
* add new java 11 test cases

Signed-off-by: ojcelis <[email protected]>

* update typo

Signed-off-by: ojcelis <[email protected]>

* update where to get utils and constants

Signed-off-by: ojcelis <[email protected]>

* missed the other folder

Signed-off-by: ojcelis <[email protected]>

* update indentation

Signed-off-by: ojcelis <[email protected]>

* update last lint errors

Signed-off-by: ojcelis <[email protected]>

* update make matrix

Signed-off-by: ojcelis <[email protected]>

* JAVA 17 install pax test

Signed-off-by: ojcelis <[email protected]>

* remove java 17 and 11+pax tests

Signed-off-by: MarkAckert <[email protected]>

* cleanup some merge issues

Signed-off-by: MarkAckert <[email protected]>

---------

Signed-off-by: ojcelis <[email protected]>
Signed-off-by: MarkAckert <[email protected]>
Co-authored-by: MarkAckert <[email protected]>
  • Loading branch information
ojcelis and MarkAckert authored Dec 16, 2024
1 parent ed33ee6 commit 2f65256
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .github/scripts/cicd_test/make_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ case $install_test_choice in
test_file="$ZOS_NODE_V20_TESTFILE"
;;

"z/OS java 11 Pax")
test_file="$ZOS_JAVA_11_PAX_TESTFILE"
;;

"z/OS java 11 Keyring")
test_file="$ZOS_JAVA_11_KYRNG_TESTFILE"
;;

"z/OS node v22")
test_file="$ZOS_NODE_V22_TESTFILE"
;;
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cicd-test-readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin
- SMPE PTF
- Extensions
- Keyring
- z/OS java 11 Pax
- z/OS java 11 Keyring
- z/OS node v20
- Non-strict Verify External Certificate
- Install PTF twice
Expand Down Expand Up @@ -121,7 +123,11 @@ Selected test running elapsed time:
| ---- | ------------ |
| Convenience Pax | 53m |
| SMPE PTF | 68m |
| Keyring | 53m |
| z/OS node v20 | 45m |
| z/OS node v22 | 45m |
| z/OS java 11 Pax | 53m |
| z/OS java 11 Keyring | 53m |
| Keyring | 53m |
| Non-strict Verify External Certificate | 51m |
| Extensions | 67m
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/cicd-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ on:
- Keyring
- z/OS node v20
- z/OS node v22
- z/OS java 11 Pax
- z/OS java 11 Keyring
- Non-strict Verify External Certificate
- Install PTF Twice
- VSAM Caching Storage Method
Expand Down Expand Up @@ -83,6 +85,8 @@ env:
KEYRING_TESTFILE: extended/keyring.ts
ZOS_NODE_V20_TESTFILE: extended/node-versions/node-v20.ts
ZOS_NODE_V22_TESTFILE: extended/node-versions/node-v22.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
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
Expand Down Expand Up @@ -301,6 +305,12 @@ jobs:
case 'z/OS node v20':
eta = 45
break;
case 'z/OS java 11 Pax':
eta = 53
break;
case 'z/OS java 11 Keyring':
eta = 53
break;q
case 'Infinispan Caching Storage Method':
eta = 51
break;
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
})
});

Original file line number Diff line number Diff line change
@@ -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);
})
});

0 comments on commit 2f65256

Please sign in to comment.