From 24f06e539016c35f9c738ece1bc46b3c80f6c3f4 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Mon, 14 Aug 2023 15:47:57 -0400 Subject: [PATCH 1/2] update node version 14, 16 & 18 Signed-off-by: ojcelis --- .github/workflows/cicd-test.yml | 4 ++-- .pax/pre-packaging.sh | 2 +- .../src/__tests__/extended/node-versions/node-v14.ts | 2 +- .../src/__tests__/extended/node-versions/node-v16.ts | 2 +- .../src/__tests__/extended/node-versions/node-v18.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index 8f96a23a5f..4c4ea7b1d2 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -63,8 +63,8 @@ env: DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax # below block can be overwritten, adjusted by DevOps only - # ZOS_NODE_VERSION more to choose from: v14.21.3, v16.19.1 - ZOS_NODE_VERSION: v14.21.3 + # ZOS_NODE_VERSION more to choose from: v14.21.3.1, v16.20.1 + ZOS_NODE_VERSION: v14.21.3.1 CLIENT_NODE_VERSION: v12.18.3 INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:* SANITY_TEST_DEBUG_INFORMATION: zowe-sanity-test:* diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index eccbd2d66a..236a3d2595 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -147,7 +147,7 @@ SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh BASE_DIR=$(cd $(dirname "$0"); pwd) # /.pax # use node v14 to build -export NODE_HOME=/ZOWE/node/node-v14.21.3-os390-s390x +export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x-202306302026 ZOWE_ROOT_DIR="${BASE_DIR}/content" 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 0889466a2c..16356e8161 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts @@ -32,7 +32,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v14.21.3-os390-s390x', + 'zos_node_home': '/ZOWE/node/node-v14.21.3.1-os390-s390x-202306302026', 'zowe_lock_keystore': 'false', } ); diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts index 65823a2179..37a5851b62 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts @@ -32,7 +32,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v16.19.1-os390-s390x', + 'zos_node_home': '/ZOWE/node/node-v16.20.1-os390-s390x-202307241558', 'zowe_lock_keystore': 'false', } ); diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v18.ts b/tests/installation/src/__tests__/extended/node-versions/node-v18.ts index e0c7cbb5d0..f44632a305 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v18.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v18.ts @@ -33,7 +33,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v18.14.2', + 'zos_node_home': '/ZOWE/node/node-v18.16.0', 'zowe_lock_keystore': 'false', } ); From 96f3e8fb752b7169a86487c6412e6e963a593a39 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 15 Aug 2023 10:53:47 -0400 Subject: [PATCH 2/2] update node directory Signed-off-by: ojcelis --- .pax/pre-packaging.sh | 2 +- .../src/__tests__/extended/node-versions/node-v14.ts | 2 +- .../src/__tests__/extended/node-versions/node-v16.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pax/pre-packaging.sh b/.pax/pre-packaging.sh index 236a3d2595..819d4818ea 100755 --- a/.pax/pre-packaging.sh +++ b/.pax/pre-packaging.sh @@ -147,7 +147,7 @@ SCRIPT_NAME=$(basename "$0") # $0=./pre-packaging.sh BASE_DIR=$(cd $(dirname "$0"); pwd) # /.pax # use node v14 to build -export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x-202306302026 +export NODE_HOME=/ZOWE/node/node-v14.21.3.1-os390-s390x ZOWE_ROOT_DIR="${BASE_DIR}/content" 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 16356e8161..00d47e38ab 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v14.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v14.ts @@ -32,7 +32,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v14.21.3.1-os390-s390x-202306302026', + 'zos_node_home': '/ZOWE/node/node-v14.21.3.1-os390-s390x', 'zowe_lock_keystore': 'false', } ); diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts index 37a5851b62..bebbbdb660 100644 --- a/tests/installation/src/__tests__/extended/node-versions/node-v16.ts +++ b/tests/installation/src/__tests__/extended/node-versions/node-v16.ts @@ -32,7 +32,7 @@ describe(testSuiteName, () => { { 'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'], 'zowe_custom_for_test': 'true', - 'zos_node_home': '/ZOWE/node/node-v16.20.1-os390-s390x-202307241558', + 'zos_node_home': '/ZOWE/node/node-v16.20.1-os390-s390x', 'zowe_lock_keystore': 'false', } );