Merge branch 'master' into encoding-ftu-fix

Signed-off-by: Jace Roell <[email protected]>

__tests__/__packages__/cli-test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/uuid": "^10.0.0",
-    "@zowe/imperative": "8.6.0"
+    "@zowe/imperative": "8.6.1"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0"

__tests__/__resources__/properties/default_properties.yaml

@@ -104,6 +104,8 @@ zosjobs:
   modifiedJobclass: B
   # System affinity
   sysaff: zosjobs-sysaff
+  # CIM Support
+  skipCIM: false
 #-----------------------------------------------------------------------------#
 #  Set of properties for testing provisioning                                 #
 #-----------------------------------------------------------------------------#

__tests__/__src__/properties/ITestZosJobsSchema.ts

@@ -16,4 +16,5 @@ export interface ITestZosJobsSchema {
     jobclass: string;
     modifiedJobclass: string;
     sysaff: string;
+    skipCIM?: boolean;
 }

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.6.0",
+  "version": "8.6.1",
   "command": {
     "publish": {
       "ignoreChanges": [

packages/cli/CHANGELOG.md

@@ -2,10 +2,16 @@
 
 All notable changes to the Zowe CLI package will be documented in this file.
 
+
 ## Recent Changes
 
 - BugFix: Resolved issue where `zowe zos-files upload file-to-uss` was not properly handling command flags. [#2234](https://github.com/zowe/zowe-cli/pull/2334)
 
+## `8.6.1`
+
+- BugFix: Fixed an issue where the `zowe zos-logs list logs` command could fail or not return all logs if a start time was not supplied. [#2336](https://github.com/zowe/zowe-cli/pull/2336)
+
+
 ## `8.6.0`
 
 - Enhancement: Added support for running applications on TSO/E address spaces. Start applications and receive/transmit messages using the new `tso start`, `tso receive` and `tso send` commands. [#2280](https://github.com/zowe/zowe-cli/pull/2280)

packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 HOST=$1

packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init_cert.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 HOST=$1

packages/cli/__tests__/config/auto-init/__system__/__scripts__/config_auto_init_profile.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 zowe config auto-init

packages/cli/__tests__/config/auto-init/__system__/cli.config.auto-init.system.test.ts

@@ -45,6 +45,7 @@ describe("config auto-init without profile", () => {
                 base.rejectUnauthorized
             ]
         );
+        expect(response.status).toEqual(0);
 
         const config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
         // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -107,6 +108,7 @@ describe("config auto-init without profile", () => {
                 base.rejectUnauthorized
             ]
         );
+        expect(response.status).toEqual(0);
 
         config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
         // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -186,6 +188,7 @@ describe("config auto-init without profile and with certificates", () => {
                     base.rejectUnauthorized
                 ]
             );
+            expect(response.status).toEqual(0);
 
             const config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
             // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -254,6 +257,7 @@ describe("config auto-init without profile and with certificates", () => {
                     base.rejectUnauthorized
                 ]
             );
+            expect(response.status).toEqual(0);
 
             config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
             // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -319,6 +323,7 @@ describe("config auto-init with profile", () => {
 
     it("should successfully issue the auto-init command", () => {
         const response = runCliScript(__dirname + "/__scripts__/config_auto_init_profile.sh", TEST_ENVIRONMENT);
+        expect(response.status).toEqual(0);
 
         const config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
         // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42
@@ -379,6 +384,7 @@ describe("config auto-init with profile and certificates", () => {
 
     it("should successfully issue the auto-init command", () => {
         const response = runCliScript(__dirname + "/__scripts__/config_auto_init_profile.sh", TEST_ENVIRONMENT);
+        expect(response.status).toEqual(0);
 
         const config = fs.readFileSync(path.join(TEST_ENVIRONMENT.workingDir, "zowe.config.json")).toString();
         // Typecasting because of this issue: https://github.com/kaelzhang/node-comment-json/issues/42

packages/cli/__tests__/zosjobs/__system__/cancel/__scripts__/job/cancel_job.sh

@@ -16,6 +16,8 @@ then
     exit $RC
 fi
 
+sleep 1
+
 # Cancel the job
 zowe jobs cancel job $JOBID
 RC=$?