From 550ecf5cfffe8b3b5c01426704237ecc9a0ebab1 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 19 Sep 2023 10:57:18 -0400 Subject: [PATCH] disable node 14 tests Signed-off-by: ojcelis --- .github/scripts/cicd_test/make_matrix.sh | 4 ---- .github/workflows/cicd-test-readme.md | 4 +--- .github/workflows/cicd-test.yml | 7 +------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh index a0614e04d4..6d9b315958 100644 --- a/.github/scripts/cicd_test/make_matrix.sh +++ b/.github/scripts/cicd_test/make_matrix.sh @@ -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" ;; diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md index 4c8f249574..d62ab908f3 100644 --- a/.github/workflows/cicd-test-readme.md +++ b/.github/workflows/cicd-test-readme.md @@ -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 @@ -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. @@ -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 diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 6987526dce..ecda773745 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -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 @@ -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: @@ -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;