Review comments

Signed-off-by: stevenhorsman <steven@uk.ibm.com>

.pax/pre-packaging.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -e
-set -x
-
-################################################################################
-# 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 2018, 2020
-################################################################################
-
-FUNC=[CreatePax][pre-packaging]
-PWD=$(pwd)
-
-# display extracted files
-echo "$FUNC content of $PWD...."
-find . -print

.pax/prepare-workspace.sh

@@ -24,8 +24,6 @@ PAX_WORKSPACE_DIR=.pax
 PACKAGE_NAME=$(node -e "console.log(require('./package.json').name)")
 PACKAGE_VERSION=$(node -e "console.log(require('./package.json').version)")
 PACKAGE_DESC=$(node -e "console.log(require('./package.json').description)")
-# APPLICAIION_URI=$(node -e "console.log(require('./package.json').config.baseuri)")
-# APPLICAIION_PORT=$(node -e "console.log(require('./package.json').config.port)")
 ZOWE_PLUGIN_ID="com.ibm.${PACKAGE_NAME}"
 
 cd $BASEDIR
@@ -51,6 +49,7 @@ cp README.md "${PAX_WORKSPACE_DIR}/content"
 cp package.json "${PAX_WORKSPACE_DIR}/content"
 cp package-lock.json "${PAX_WORKSPACE_DIR}/content"
 cp -r dist/. "${PAX_WORKSPACE_DIR}/content"
+cp -r server/. "${PAX_WORKSPACE_DIR}/content/server"
 
 # copy start script to target folder
 echo "[${SCRIPT_NAME}] copying startup script ..."

Jenkinsfile

@@ -21,20 +21,6 @@ node('ibm-jenkins-slave-dind') {
   pipeline.setup(
     packageName: 'org.zowe.sample-node-api',
     nodeJsVersion: 'v10.18.1',
-    github: [
-      email                      : lib.Constants.DEFAULT_GITHUB_ROBOT_EMAIL,
-      usernamePasswordCredential : lib.Constants.DEFAULT_GITHUB_ROBOT_CREDENTIAL,
-    ],
-    artifactory: [
-      url                        : lib.Constants.DEFAULT_LFJ_ARTIFACTORY_URL,
-      usernamePasswordCredential : lib.Constants.DEFAULT_LFJ_ARTIFACTORY_ROBOT_CREDENTIAL,
-    ],
-    pax: [
-      sshHost                    : lib.Constants.DEFAULT_PAX_PACKAGING_SSH_HOST,
-      sshPort                    : lib.Constants.DEFAULT_PAX_PACKAGING_SSH_PORT,
-      sshCredential              : lib.Constants.DEFAULT_PAX_PACKAGING_SSH_CREDENTIAL,
-      remoteWorkspace            : lib.Constants.DEFAULT_PAX_PACKAGING_REMOTE_WORKSPACE,
-    ],
     installRegistries: [
       [
         email                      : lib.Constants.DEFAULT_LFJ_NPM_PRIVATE_REGISTRY_EMAIL,
@@ -45,12 +31,7 @@ node('ibm-jenkins-slave-dind') {
     publishRegistry: [
       email                      : lib.Constants.DEFAULT_LFJ_NPM_PRIVATE_REGISTRY_EMAIL,
       usernamePasswordCredential : lib.Constants.DEFAULT_LFJ_NPM_PRIVATE_REGISTRY_CREDENTIAL,
-    ],
+    ]
-    // FIXME: ideally this should set to false (using default by remove this line)
-    ignoreAuditFailure            : true,
-    // FIXME: npm version in ibm-jenkins-slave-dind is too old, doesn't support "npm ci"
-    alwaysUseNpmInstall           : true
-
   )
 
   pipeline.build()