From 1323392789750fb6eb30d5617976f12d5ae7c041 Mon Sep 17 00:00:00 2001
From: MarkAckert <mark.ackert@broadcom.com>
Date: Mon, 9 Dec 2024 16:21:13 -0500
Subject: [PATCH] add node-v22 tests and add them to extended suite

Signed-off-by: MarkAckert <mark.ackert@broadcom.com>
---
 .github/scripts/cicd_test/make_matrix.sh      |  4 ++
 .github/workflows/cicd-test.yml               |  4 +-
 .../extended/node-versions/node-v22.ts        | 44 +++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 tests/installation/src/__tests__/extended/node-versions/node-v22.ts

diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh
index 0af3d8cd77..4aea7a10ae 100644
--- a/.github/scripts/cicd_test/make_matrix.sh
+++ b/.github/scripts/cicd_test/make_matrix.sh
@@ -36,6 +36,10 @@ case $install_test_choice in
   test_file="$ZOS_NODE_V20_TESTFILE"
   ;;
 
+"z/OS node v22")
+  test_file="$ZOS_NODE_V22_TESTFILE"
+  ;;
+
 "Non-strict Verify External Certificate")
   test_file="$NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE"
   ;;
diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml
index f6812623e6..84571eaab5 100644
--- a/.github/workflows/cicd-test.yml
+++ b/.github/workflows/cicd-test.yml
@@ -32,6 +32,7 @@ on:
           - Extensions
           - Keyring
           - z/OS node v20
+          - z/OS node v22
           - Non-strict Verify External Certificate
           - Install PTF Twice
           - VSAM Caching Storage Method
@@ -81,6 +82,7 @@ env:
   EXTENSIONS_TESTFILE: basic/install-ext.ts
   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
   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
@@ -88,7 +90,7 @@ env:
   CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts
   GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts
   ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-fmid.ts(all)
-  ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-fmid.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v20.ts(zzow11):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any)
+  ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-fmid.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v20.ts(any);extended/node-versions/node-v22.ts(any);extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any)
 
 jobs:
   display-dispatch-event-id:
diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v22.ts b/tests/installation/src/__tests__/extended/node-versions/node-v22.ts
new file mode 100644
index 0000000000..8375055f01
--- /dev/null
+++ b/tests/installation/src/__tests__/extended/node-versions/node-v22.ts
@@ -0,0 +1,44 @@
+/**
+ * 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 Zowe Contributors 2024
+ */
+
+import {
+  checkMandatoryEnvironmentVariables,
+  installAndVerifyConvenienceBuild,
+  showZoweRuntimeLogs,
+} from '../../../utils';
+import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants';
+
+const testServer = process.env.TEST_SERVER;
+const testSuiteName = 'Test convenience build installation with node.js v22';
+describe(testSuiteName, () => {
+  beforeAll(() => {
+    // validate variables
+    checkMandatoryEnvironmentVariables([
+      '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_node_home': '/ZOWE/node/node-v22.10.0',
+        'zowe_lock_keystore': 'false',
+      }
+    );
+  }, TEST_TIMEOUT_CONVENIENCE_BUILD);
+
+  afterAll(async () => {
+    await showZoweRuntimeLogs(testServer);
+  })
+});