Add a new upgrade test case

.github/scripts/cicd_test/make_matrix.sh

@@ -56,6 +56,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/scripts/cicd_test/prep7_more_test_prep/02_process_zowe_art_pattern.sh

@@ -54,7 +54,7 @@ else
 fi
 
 if [[ -n "$use_defaut" ]]; then
-    if [[ "$MATRIX_TEST" == *install-fmid.ts ]] || [[ "$MATRIX_TEST" == *install-ptf.ts ]]; then
+    if [[ "$MATRIX_TEST" == *install-fmid.ts ]] || [[ "$MATRIX_TEST" == *install-ptf.ts ]] || [[ "$MATRIX_TEST" == *install-base-then-upgrade.ts ]]; then
         zowe_artifactory_pattern_interim="$DEFAULT_ZOWE_SMPE_ARTIFACTORY_PATTERN"
     else
         zowe_artifactory_pattern_interim="$DEFAULT_ZOWE_PAX_ARTIFACTORY_PATTERN"

.github/workflows/cicd-test.yml

@@ -41,6 +41,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:
@@ -89,6 +90,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/upgrades/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,
+      {
+        'zowe_custom_for_test': 'true'
+      },
+      {
+        'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
+        'zowe_custom_for_test': false,
+        '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

@@ -50,7 +50,7 @@
  *
  * @param {Any} obj        any object
  */
 export function calculateHash(obj: any): string {
   return crypto.createHash('md5').update(util.format('%j', obj)).digest('hex');
 }
 
@@ -87,7 +87,7 @@
  * @param {Object} extraVars      Object
  * @param {String} serverId       String
  */
 export function importDefaultExtraVars(extraVars: {[key: string]: any}, serverId: string): void {
   const defaultMapping: {[key: string]: string[]} = {
     'ansible_ssh_host'           : ['SSH_HOST'],
     'ansible_port'               : ['SSH_PORT'],
@@ -138,7 +138,7 @@
  * @param  {Object}    extraVars
  * @param  {String}    verbose
  */
 export function runAnsiblePlaybook(testcase: string, playbook: string, serverId: string, extraVars: {[key: string]: any} = {}, verbose = '-v'): Promise<PlaybookResponse> {
   return new Promise((resolve, reject) => {
     const result: PlaybookResponse = {
       reportHash: calculateHash(testcase),
@@ -185,7 +185,7 @@
   });
 }
 
 async function verifyZowe(testcase: string, serverId: string, extraVars: {[key: string]: any} = {}): Promise<PlaybookResponse> {
   debug(`run verify.yml on ${serverId}`);
   let resultVerify;
 
@@ -212,7 +212,7 @@
  * @param  {String}    serverId
  * @param  {Object}    extraVars
  */
 async function installAndVerifyZowe(testcase: string, installPlaybook: string, serverId: string, extraVars: {[key: string]: any} = {}): Promise<void> {
   debug(`installAndVerifyZowe(${testcase}, ${installPlaybook}, ${serverId}, ${JSON.stringify(extraVars)})`);
 
   debug(`run ${installPlaybook} on ${serverId}`);
@@ -248,7 +248,7 @@
   }
 }
 
 async function installExtension(testcase: string, serverId: string, extraVars: {[key: string]: any} = {}): Promise<void> {
   debug(`run install-ext.yml on ${serverId}`);
   const resultInstall = await runAnsiblePlaybook(
     testcase,
@@ -302,7 +302,7 @@
 
 }
 
 async function verifyExtension(testcase: string, serverId: string, extraVars: {[key: string]: any} = {}): Promise<PlaybookResponse> {
   debug(`run verify-ext.yml on ${serverId}`);
   // FIXME: how to verify in v2?
   let resultVerify;
@@ -329,7 +329,7 @@
  * @param  {String}    serverId
  * @param  {Object}    extraVars
  */
 export async function installAndVerifyConvenienceBuild(testcase: string, serverId: string, extraVars: {[key: string]: any} = {}): Promise<void> {
   await installAndVerifyZowe(testcase, 'install.yml', serverId, extraVars);
 }
 
@@ -416,20 +416,25 @@
  * @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);