-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add new extended test cases - Zowe v2 and Java 11 (#3571)
* 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
1 parent
ed33ee6
commit 2f65256
Showing
5 changed files
with
119 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
tests/installation/src/__tests__/extended/java-versions/java11/install-keyring.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
}) | ||
}); | ||
|
45 changes: 45 additions & 0 deletions
45
tests/installation/src/__tests__/extended/java-versions/java11/install-pax.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
}) | ||
}); | ||
|