Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -38,5 +38,5 @@ testem.log
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
|
||||
mock-api/**/node_modules
|
||||
mock-api/**/api.json
|
||||
|
||||
4
openshift/dev/Jenkinsfile
vendored
4
openshift/dev/Jenkinsfile
vendored
@@ -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}"
|
||||
@@ -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! ###'
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user