Merge pull request #262 from matthewpwilson/zowe-lts-signed

Move to compatibility with Zowe lts-incremental

Author: matthewpwilson

Jenkinsfile

@@ -89,7 +89,7 @@ def PRODUCT_NAME = "zowe-cli-cics-deploy-plugin"
 /**
  * This is where the Zowe project needs to be installed
  */
-def ZOWE_CLI_INSTALL_DIR = "/.npm-global/lib/node_modules/@zowee/cli"
+def ZOWE_CLI_INSTALL_DIR = "/.npm-global/lib/node_modules/@brightside/core"
 
 def ARTIFACTORY_CREDENTIALS_ID = "c8e3aa62-5eef-4e6b-8a3f-aa1006a7ef01"
 
@@ -231,13 +231,11 @@ pipeline {
                 timeout(time: 10, unit: 'MINUTES') {
                     echo "Install Zowe CLI globaly"
                     sh "rm -f .npmrc"
-                    sh("npm set registry https://registry.npmjs.org")
-                    //sh("npm set @brightside:registry https://api.bintray.com/npm/ca/brightside/")
-                    //sh("npm set @zowe:registry https://api.bintray.com/npm/ca/brightside/")
-                    sh("npm set @zowe:registry https://registry.npmjs.org")
+                    sh "npm set registry https://registry.npmjs.org"
+                    sh "npm set @brightside:registry=https://api.bintray.com/npm/ca/brightside/"
 
-                    sh("npm install -g @zowe/cli@latest")
-                    sh("zowe --version")
+                    sh "npm install -g @brightside/core@lts-incremental"
+                    sh "zowe --version"
                 }
             }
         }
@@ -622,8 +620,8 @@ pipeline {
                         sh "rm -f .npmrc"
                         sh 'curl -u $USERNAME:$API_KEY https://eu.artifactory.swg-devops.com/artifactory/api/npm/auth/ >> .npmrc'
                         sh "echo registry=$TEST_NPM_REGISTRY >> .npmrc"
-                        sh "echo @zowe:registry=https://registry.npmjs.org >> .npmrc"
-                        sh "echo @zowe:always-auth=false >> .npmrc"
+                        sh "echo @brightside:registry=https://api.bintray.com/npm/ca/brightside/ >> .npmrc"
+                        sh "echo @brightside:always-auth=false >> .npmrc"
 
                         script {
                             if (BRANCH_NAME == MASTER_BRANCH) {

__tests__/__src__/environment/TestEnvironment.ts

@@ -10,7 +10,7 @@
 */
 
 import {ISetupEnvironmentParms} from "./doc/parms/ISetupEnvironmentParms";
-import {ImperativeError, ImperativeExpect, IO, Logger, TextUtils} from "@zowe/imperative";
+import {ImperativeError, ImperativeExpect, IO, Logger, TextUtils} from "@brightside/imperative";
 import * as nodePath from "path";
 import {mkdirpSync} from "fs-extra";
 import {ITestEnvironment} from "./doc/response/ITestEnvironment";

__tests__/api/BundleContent/AutoBundler.test.ts

@@ -10,7 +10,7 @@
 */
 
 import { AutoBundler } from "../../../src/api/BundleContent/AutoBundler";
-import { IHandlerParameters } from "@zowe/imperative";
+import { IHandlerParameters } from "@brightside/imperative";
 import * as GenerateBundleDefinition from "../../../src/cli/generate/bundle/GenerateBundle.definition";
 import * as fse from "fs-extra";
 

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -10,9 +10,9 @@
 */
 
 import { BundleDeployer } from "../../../src/api/BundleDeploy/BundleDeployer";
-import { IHandlerParameters, TaskStage } from "@zowe/imperative";
+import { IHandlerParameters, TaskStage } from "@brightside/imperative";
 import * as DeployBundleDefinition from "../../../src/cli/deploy/bundle/DeployBundle.definition";
-import { ZosmfSession, SubmitJobs, List } from "@zowe/cli";
+import { ZosmfSession, SubmitJobs, List } from "@brightside/core";
 
 
 const DEFAULT_PARAMTERS: IHandlerParameters = {

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -10,12 +10,12 @@
 */
 
 import { BundlePusher } from "../../../src/api/BundlePush/BundlePusher";
-import { IHandlerParameters, ImperativeError, IImperativeError, IProfile, Session } from "@zowe/imperative";
-import * as cmci from "@zowe/cics";
+import { IHandlerParameters, ImperativeError, IImperativeError, IProfile, Session } from "@brightside/imperative";
+import * as cmci from "@brightside/cics";
 import * as PushBundleDefinition from "../../../src/cli/push/bundle/PushBundle.definition";
 import * as fse from "fs-extra";
 import * as fs from "fs";
-import { ZosmfSession, SshSession, SubmitJobs, Shell, List, Upload, Create } from "@zowe/cli";
+import { ZosmfSession, SshSession, SubmitJobs, Shell, List, Upload, Create } from "@brightside/core";
 
 const DEFAULT_PARAMTERS: IHandlerParameters = {
     arguments: {

__tests__/api/BundlePush/SubtaskWithStatus.test.ts

@@ -9,7 +9,7 @@
 *
 */
 import { SubtaskWithStatus } from "../../../src/api/BundlePush/SubtaskWithStatus";
-import { TaskStage, ITaskWithStatus, TaskProgress } from "@zowe/imperative";
+import { TaskStage, ITaskWithStatus, TaskProgress } from "@brightside/imperative";
 
 
 let parentTask: ITaskWithStatus;

__tests__/cli/deploy/Deploy.definition.test.ts

@@ -11,7 +11,7 @@
 */
 
 import * as fs from "fs";
-import { Imperative } from "@zowe/imperative";
+import { Imperative } from "@brightside/imperative";
 
 describe("Deploy definition", () => {
     it("should match the snapshot", () => {

__tests__/cli/deploy/bundle/DeployBundle.definition.test.ts

@@ -11,7 +11,7 @@
 */
 
 import * as fs from "fs";
-import { Imperative } from "@zowe/imperative";
+import { Imperative } from "@brightside/imperative";
 
 describe("bundle definition", () => {
     it("should match the snapshot", () => {

__tests__/cli/deploy/bundle/DeployBundle.handler.test.ts

@@ -10,7 +10,7 @@
 *
 */
 
-import {IHandlerParameters, ImperativeError} from "@zowe/imperative";
+import {IHandlerParameters, ImperativeError} from "@brightside/imperative";
 import * as DeployBundleDefinition from "../../../../src/cli/deploy/bundle/DeployBundle.definition";
 import * as DeployBundleHandler from "../../../../src/cli/deploy/bundle/DeployBundle.handler";
 

__tests__/cli/generate/Generate.definition.test.ts

@@ -11,7 +11,7 @@
 */
 
 import * as fs from "fs";
-import { Imperative } from "@zowe/imperative";
+import { Imperative } from "@brightside/imperative";
 
 describe("Generate definition", () => {
     it("should match the snapshot", () => {