Skip to content

Commit

Permalink
Merge pull request #3580 from zowe/users/oscar/disablenode14tests
Browse files Browse the repository at this point in the history
Disable some tests not needed
  • Loading branch information
ojcelis authored Sep 19, 2023
2 parents 7ae93c4 + 550ecf5 commit 8166289
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
4 changes: 0 additions & 4 deletions .github/scripts/cicd_test/make_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ case $install_test_choice in
test_file="$KEYRING_TESTFILE"
;;

"z/OS node v14")
test_file="$ZOS_NODE_V14_TESTFILE"
;;

"z/OS node v16")
test_file="$ZOS_NODE_V16_TESTFILE"
;;
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/cicd-test-readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin
- Tech Preview Docker
- Extensions
- Keyring
- z/OS node v14
- z/OS node v16
- Non-strict Verify External Certificate
- Install PTF twice
Expand Down Expand Up @@ -121,7 +120,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins
When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 19 independent jobs will be spawned.
```
basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-docker.ts(zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v14.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02);extended/caching-storages/infinispan-storage.ts
basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-docker.ts(zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02);extended/caching-storages/infinispan-storage.ts
```
Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours.
Expand All @@ -135,7 +134,6 @@ Selected test running elapsed time:
| SMPE PTF | 47m |
| Tech Preview Docker | 22m |
| z/OS node v16 | 25m |
| z/OS node v14 | 25m |
| Keyring | 27m |
| Non-strict Verify External Certificate | 25m |
| Extensions | 35m
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/cicd-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ on:
- Tech Preview Docker
- Extensions
- Keyring
- z/OS node v14
- z/OS node v16
- Non-strict Verify External Certificate
- Install PTF Twice
Expand Down Expand Up @@ -74,14 +73,13 @@ env:
TECH_PREVIEW_DOCKER_TESTFILE: basic/install-docker.ts
EXTENSIONS_TESTFILE: basic/install-ext.ts
KEYRING_TESTFILE: extended/keyring.ts
ZOS_NODE_V14_TESTFILE: extended/node-versions/node-v14.ts
ZOS_NODE_V16_TESTFILE: extended/node-versions/node-v16.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
GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts
ZOWE_RELEAE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-docker.ts(any);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v16.ts(all);extended/node-versions/node-v14.ts(all);extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any)
ZOWE_RELEAE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-docker.ts(any);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v16.ts(any);extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any)
ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-docker.ts(any)

jobs:
Expand Down Expand Up @@ -294,9 +292,6 @@ jobs:
case 'Keyring':
eta = 27
break;
case 'z/OS node v14':
eta = 25
break;
case 'z/OS node v16':
eta = 25
break;
Expand Down

0 comments on commit 8166289

Please sign in to comment.