This is an automated email from the ASF dual-hosted git repository.
iuliana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/master by this push:
new 2b71571 Use double quotes to resolve DOCKER_TAG
new 729d29c Merge pull request #180 from algairim/build/Jenkinsfile
2b71571 is described below
commit 2b71571771d70c730898a2ee8250d38e0eba9ae3
Author: Mykola Mandra <[email protected]>
AuthorDate: Mon Feb 21 15:17:11 2022 +0000
Use double quotes to resolve DOCKER_TAG
Signed-off-by: Mykola Mandra <[email protected]>
---
Jenkinsfile | 3 ++-
docker-itest/Jenkinsfile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ee514ff..b01ff30 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,8 @@ node(label: 'ubuntu') {
sh 'mkdir -p ${WORKSPACE}/.m2'
sh 'docker logout' // needed because sometimes cached
credentials break the following step (creds aren't needed)
echo 'Building docker image for test environment ...'
- environmentDockerImage = docker.build('brooklyn:${DOCKER_TAG}')
+ echo "Using docker tag DOCKER_TAG=${DOCKER_TAG}" // double
quotes to resolve env vars
+ environmentDockerImage =
docker.build("brooklyn:${DOCKER_TAG}") // double quotes to resolve env vars
}
stage('Run tests') {
diff --git a/docker-itest/Jenkinsfile b/docker-itest/Jenkinsfile
index 48fbbdc..7faa7f3 100644
--- a/docker-itest/Jenkinsfile
+++ b/docker-itest/Jenkinsfile
@@ -34,7 +34,8 @@ node(label: 'ubuntu') {
sh 'git submodule init'
sh 'git submodule update --remote --merge --recursive'
echo 'Building docker image for test environment ...'
- environmentDockerImage = docker.build('brooklyn:${DOCKER_TAG}')
+ echo "Using docker tag DOCKER_TAG=${DOCKER_TAG}" // double
quotes to resolve env vars
+ environmentDockerImage =
docker.build("brooklyn:${DOCKER_TAG}") // double quotes to resolve env vars
}
stage('Run tests') {