Add a new upgrade test case

.github/scripts/cicd_test/make_matrix.sh

@@ -48,6 +48,10 @@ case $install_test_choice in
   test_file="$INSTALL_PTF_TWICE_TESTFILE"
   ;;
 
+"Upgrade Zowe (3.0 to latest)")
+  test_file="$UPGRADE_ZOWE_TESTFILE"
+  ;;
+
 "VSAM Caching Storage Method")
   test_file="$VSAM_CACHING_STORAGE_METHOD_TESTFILE"
   ;;

.github/workflows/cicd-test.yml

@@ -39,6 +39,7 @@ on:
           - Infinispan Caching Storage Method
           - Config Manager
           - Generate API Documentation
+          - Upgrade Zowe (3.0 to latest)
           - Zowe Nightly Tests
           - Zowe Release Tests
       custom-zowe-artifactory-pattern-or-build-number:
@@ -85,6 +86,7 @@ env:
   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
+  UPGRADE_ZOWE_TESTFILE: extended/install-base-then-upgrade.ts
   VSAM_CACHING_STORAGE_METHOD_TESTFILE: extended/caching-storages/vsam-storage.ts
   INFINISPAN_CACHING_STORAGE_METHOD_TESTFILE: extended/caching-storages/infinispan-storage.ts
   CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts

playbooks/install-ptf.yml

@@ -74,6 +74,7 @@
   # Configure Zowe ?
   - import_role:
       name: configure
+    when: zowe_ptf_configure|default(True)
 
   # ============================================================================
   # Customize for testing

tests/installation/src/__tests__/basic/install-ptf.ts

@@ -29,6 +29,7 @@ describe(testSuiteName, () => {
     await installAndVerifySmpePtf(
       testSuiteName,
       process.env.TEST_SERVER,
+      {},
       {
         'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
         'zowe_custom_for_test': 'true',

tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts

@@ -35,6 +35,7 @@ describe(testSuiteName, () => {
     await installAndVerifySmpePtf(
       testSuiteName,
       testServer,
+      {},
       {
         'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
         'zowe_custom_for_test': 'true',

tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts

@@ -34,6 +34,7 @@ describe(testSuiteName, () => {
     await installAndVerifySmpePtf(
       testSuiteName,
       testServer,
+      {},
       {
         'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
         'zowe_custom_for_test': 'true',

tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts

@@ -35,6 +35,7 @@ describe(testSuiteName, () => {
     await installAndVerifySmpePtf(
       testSuiteName,
       testServer,
+      {},
       {
         'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
         'zowe_custom_for_test': 'true',

tests/installation/src/__tests__/extended/upgrades/install-base-then-upgrade.ts

@@ -0,0 +1,49 @@
+/**
+ * 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,
+  installAndVerifySmpePtf,
+  showZoweRuntimeLogs,
+} from '../../../utils';
+import { TEST_TIMEOUT_SMPE_FMID, TEST_TIMEOUT_SMPE_PTF } from '../../../constants';
+
+const testSuiteName = 'Test 3.0 base install then upgrade (basic config)';
+describe(testSuiteName, () => {
+  beforeAll(() => {
+    // validate variables
+    checkMandatoryEnvironmentVariables([
+      'TEST_SERVER',
+      'ZOWE_BUILD_LOCAL',
+    ]);
+  });
+
+  test('install and verify', async () => {
+    await installAndVerifySmpePtf(
+      testSuiteName,
+      process.env.TEST_SERVER,
+      {
+        'skip_start': 'false',
+      },
+      {
+        'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
+        'zowe_custom_for_test': 'true',
+        'zowe_ptf_configure': 'false',
+        'zowe_lock_keystore': 'false',
+      }
+    );
+  }, TEST_TIMEOUT_SMPE_FMID + TEST_TIMEOUT_SMPE_PTF); // long timeout since we start + test both
+
+
+  afterAll(async () => {
+    await showZoweRuntimeLogs(process.env.TEST_SERVER);
+  });
+
+});

tests/installation/src/utils.ts

@@ -416,20 +416,25 @@ export async function installAndVerifyExtension(testcase: string, serverId: stri
  * @param  {Object}    extraFmidVars
  * @param  {Object}    extraPtfVars
  */
-export async function installAndVerifySmpePtf(testcase: string, serverId: string,  extraPtfVars: {[key: string]: any} = {}): Promise<void> {
-  debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, ${JSON.stringify(extraPtfVars)})`);
+export async function installAndVerifySmpePtf(testcase: string, serverId: string, extraFmidVars: {[key: string]: any} = {}, extraPtfVars: {[key: string]: any} = {}): Promise<void> {
+  debug(`installAndVerifySmpePtf(${testcase}, ${serverId}, ${JSON.stringify(extraFmidVars)}, ${JSON.stringify(extraPtfVars)})`);
 
   debug(`run install-fmid.yml on ${serverId}`);
+
+  const fmidVars = {
+    ...{
+      'zowe_build_remote': ZOWE_FMID,
+      'skip_start': 'true',
+      ...APIML_OIDC_VARS
+    },
+    ...extraFmidVars,
+  }
 
   const resultFmid = await runAnsiblePlaybook(
     testcase,
     'install-fmid.yml',
     serverId,
-    {
-      'zowe_build_remote': ZOWE_FMID,
-      'skip_start': 'true',
-      ...APIML_OIDC_VARS
-    }
+    fmidVars
   );
 
   expect(resultFmid.code).toBe(0);