class name fix, matrix update

Signed-off-by: MarkAckert <[email protected]>
zowe · May 31, 2024 · 55c9f1e · 55c9f1e
1 parent e2d242f
commit 55c9f1e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh
@@ -12,8 +12,12 @@
 
 case $install_test_choice in
 
-"ZWE CI Build") ;;
-"ZWE Full Tests") ;;
+"ZWE CI Build")
+  test_file="dummy_not_used"
+  ;;
+"ZWE Full Tests")
+  test_file="dummy_not_used"
+  ;;
 "Convenience Pax")
   test_file="$CONVENIENCE_PAX_TESTFILE"
   ;;

diff --git a/tests/zwe-remote-integration/src/globalSetup.ts b/tests/zwe-remote-integration/src/globalSetup.ts
@@ -27,14 +27,14 @@ import {
   ZOWE_YAML_OVERRIDES,
 } from './config/TestConfig';
 import * as fs from 'fs-extra';
-import { getZosmfSession } from './zos/zowe';
+import { getSession } from './zos/ZosmfSession';
 import * as yaml from 'yaml';
 import ZoweYamlType from './config/ZoweYamlType';
 import { JfrogClient } from 'jfrog-client-js';
 import { processManifestVersion } from './utils';
 import { execSync } from 'child_process';
 
-const zosmfSession = getZosmfSession();
+const zosmfSession = getSession();
 
 function setupBaseYaml() {
   console.log(`Using example-zowe.yaml as base for future zowe.yaml modifications...`);

diff --git a/tests/zwe-remote-integration/src/globalTeardown.ts b/tests/zwe-remote-integration/src/globalTeardown.ts
@@ -11,7 +11,7 @@
 import { REMOTE_TEARDOWN, LINGERING_REMOTE_FILES_FILE, TEST_JOBS_RUN_FILE } from './config/TestConfig';
 import * as fs from 'fs-extra';
 import * as jobs from '@zowe/zos-jobs-for-zowe-sdk';
-import { getZosmfSession } from './zos/zowe';
+import { getSession } from './zos/ZosmfSession';
 import { TestFileActions, TestFile } from './zos/TestFileActions';
 module.exports = async () => {
   if (!REMOTE_TEARDOWN) {
@@ -48,7 +48,7 @@ module.exports = async () => {
       const jobName = jobPieces[0];
       const jobId = jobPieces[1];
       console.log('Purging ' + job);
-      await jobs.DeleteJobs.deleteJob(getZosmfSession(), jobName, jobId);
+      await jobs.DeleteJobs.deleteJob(getSession(), jobName, jobId);
     }
   }
 

diff --git a/tests/zwe-remote-integration/src/zos/RemoteTestRunner.ts b/tests/zwe-remote-integration/src/zos/RemoteTestRunner.ts
@@ -9,7 +9,7 @@
  */
 
 import { Session } from '@zowe/imperative';
-import { getZosmfSession } from './zowe';
+import { getSession } from './ZosmfSession';
 import * as uss from './Uss';
 import ZoweYamlType from '../config/ZoweYamlType';
 import { REMOTE_SYSTEM_INFO, TEST_JOBS_RUN_FILE, TEST_OUTPUT_DIR } from '../config/TestConfig';
@@ -25,7 +25,7 @@ export class RemoteTestRunner {
   private cleanFns: ((stdout: string) => string)[] = [];
 
   constructor(testGroup: string) {
-    this.session = getZosmfSession();
+    this.session = getSession();
     this.yamlOutputTemplate = `${TEST_OUTPUT_DIR}/${testGroup}/{{ testInstance }}/yaml`;
     this.spoolOutputTemplate = `${TEST_OUTPUT_DIR}/${testGroup}//{{ testInstance }}/spool`;
   }
@@ -46,7 +46,7 @@ export class RemoteTestRunner {
     const spoolOutputDir = this.spoolOutputTemplate.replace('{{ testInstance }}', testName);
     fs.mkdirpSync(spoolOutputDir);
     for (const job of this.trackedJobs) {
-      await jobs.DownloadJobs.downloadAllSpoolContentCommon(getZosmfSession(), {
+      await jobs.DownloadJobs.downloadAllSpoolContentCommon(getSession(), {
         ...job,
         outDir: spoolOutputDir,
         extension: '.txt', // arbitrarily chosen to keep things readable...

diff --git a/tests/zwe-remote-integration/src/zos/TestFileActions.ts b/tests/zwe-remote-integration/src/zos/TestFileActions.ts
@@ -9,11 +9,11 @@
  */
 
 import * as fs from 'fs-extra';
-import { getZosmfSession } from './zowe';
+import { getSession } from './ZosmfSession';
 import * as files from '@zowe/zos-files-for-zowe-sdk';
 import { LINGERING_REMOTE_FILES_FILE } from '../config/TestConfig';
 export class TestFileActions {
-  private static readonly session = getZosmfSession();
+  private static readonly session = getSession();
 
   constructor() {}
 

diff --git a/tests/zwe-remote-integration/src/zos/zowe.ts → ...emote-integration/src/zos/ZosmfSession.ts b/tests/zwe-remote-integration/src/zos/zowe.ts → ...emote-integration/src/zos/ZosmfSession.ts
@@ -11,7 +11,7 @@
 import { ConnectionPropsForSessCfg, Session } from '@zowe/imperative';
 import { REMOTE_CONNECTION_CFG } from '../config/TestConfig';
 
-export function getZosmfSession(): Session {
+export function getSession(): Session {
   const sessCfg: unknown = {
     hostname: REMOTE_CONNECTION_CFG.host,
     port: REMOTE_CONNECTION_CFG.zosmf_port,