From 6c67318a1752c27123d58ecb6a44951819c82353 Mon Sep 17 00:00:00 2001 From: Magnus Axelqvist Date: Tue, 20 Apr 2021 10:51:08 +0200 Subject: [PATCH 1/3] Jenkinsfile edited online with Bitbucket Renamed parameter according to CICD template. --- openshift/dev/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile index d801833..499094d 100644 --- a/openshift/dev/Jenkinsfile +++ b/openshift/dev/Jenkinsfile @@ -1,4 +1,4 @@ -def cicdproject = "${CI_CD_NAMESPACE}" +def cicdproject = "${CICD_NAMESPACE}" def appname = "${APP_NAME}" def devproject = "${DEV_NAMESPACE}" def i1project = "${I1_NAMESPACE}" From 4f74d56571a0e9faa7944ebb2a0ba77251beabe8 Mon Sep 17 00:00:00 2001 From: Fredrik T Date: Tue, 20 Apr 2021 11:41:54 +0200 Subject: [PATCH 2/3] Adds additional test output. --- openshift/dev/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile index 499094d..ab809ec 100644 --- a/openshift/dev/Jenkinsfile +++ b/openshift/dev/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { def packageJson = readJSON file: 'package.json' BUILD_TAG = "dev_v${packageJson.version}_${env.BUILD_NUMBER}_${CURRENT_COMMIT}" echo '### Build tag ###' - echo "${BUILD_TAG}" + echo "This is the build tag: ${BUILD_TAG}" } echo '### Build tag generated! ###' } From ca6f1b95e22d2972de414179132101160e8e72c1 Mon Sep 17 00:00:00 2001 From: Aden Hassan Date: Fri, 23 Apr 2021 13:40:05 +0200 Subject: [PATCH 3/3] added node_modules in mock-api folder to .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7c1a199..14e46e5 100644 --- a/.gitignore +++ b/.gitignore @@ -38,5 +38,5 @@ testem.log .DS_Store Thumbs.db - +mock-api/**/node_modules mock-api/**/api.json