From 37ef8d00740f747b42d3a47bf9718522a4639d3b Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 27 Jul 2020 12:13:02 +0100 Subject: [PATCH] Remove debug and commented out code Signed-off-by: stevenhorsman --- .pax/prepare-workspace.sh | 9 +-------- Jenkinsfile | 34 +--------------------------------- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/.pax/prepare-workspace.sh b/.pax/prepare-workspace.sh index c76abfb..1da7d23 100755 --- a/.pax/prepare-workspace.sh +++ b/.pax/prepare-workspace.sh @@ -37,10 +37,6 @@ echo "[${SCRIPT_NAME}] cleaning PAX workspace ..." rm -fr "${PAX_WORKSPACE_DIR}/content" mkdir -p "${PAX_WORKSPACE_DIR}/content" -# copy plugin definition files -# echo "[${SCRIPT_NAME}] copying plugin definitions ..." -# cp -r plugin-definition "${PAX_WORKSPACE_DIR}/content" - # build client echo "[${SCRIPT_NAME}] building client ..." cd "dist" @@ -48,7 +44,7 @@ npm install cd "${ROOT_DIR}" -# copy explorer-jes to target folder +# copy sample-node-api to target folder echo "[${SCRIPT_NAME}] copying sample node api backend ..." mkdir -p "${PAX_WORKSPACE_DIR}/content" cp README.md "${PAX_WORKSPACE_DIR}/content" @@ -56,9 +52,6 @@ cp package.json "${PAX_WORKSPACE_DIR}/content" cp package-lock.json "${PAX_WORKSPACE_DIR}/content" cp -r dist/. "${PAX_WORKSPACE_DIR}/content" -echo "Current contents:" -find "${PAX_WORKSPACE_DIR}/content" -print - # copy start script to target folder echo "[${SCRIPT_NAME}] copying startup script ..." mkdir -p "${PAX_WORKSPACE_DIR}/content/bin" diff --git a/Jenkinsfile b/Jenkinsfile index 18624eb..908ec06 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,35 +55,6 @@ node('ibm-jenkins-slave-dind') { pipeline.build() - // // we have a custom build command - // pipeline.build( - // operation: { - // ansiColor('xterm') { - // pipeline.nvmShell "npm run prod" - // } - // } - // ) - - // pipeline.test( - // name : 'Unit', - // junit : "target/report.xml", - // cobertura : [ - // coberturaReportFile : "coverage/cobertura-coverage.xml", - // // if coverage check failed, the pipeline will be marked as UNSTABLE, which - // // will block publish/release. So we overwrite default and set to false here. - // // FIXME: ideally this should set to true (using default by remove this line) - // autoUpdateStability : false, - // fileCoverageTargets : '100, 0, 0', - // classCoverageTargets : '85, 0, 0', - // methodCoverageTargets : '80, 0, 0', - // lineCoverageTargets : '80, 0, 0', - // conditionalCoverageTargets: '70, 0, 0', - // ], - // htmlReports : [ - // [dir: "coverage/lcov-report", files: "index.html", name: "Report: Code Coverage"], - // ], - // ) - // we need sonar scan // failBuild set to false whilst investigating https://github.com/zowe/zlux/issues/285 pipeline.sonarScan( @@ -106,9 +77,6 @@ node('ibm-jenkins-slave-dind') { ], allowPublishWithoutTest: true // There are no tests ) - - // define we need release stage - // pipeline.release() - + pipeline.end() }