diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-11-11 21:20:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-11 21:20:35 +0000 |
| commit | 541f015d545022837518420c2e90b5aa5d894217 (patch) | |
| tree | 251628e1d2397a8e8fa4bd523a593ff106a31361 | |
| parent | eb3fee94bcf29d6efc728b518a552bd9d01870c4 (diff) | |
| parent | 6345357f77177bbf1d8ad543e8a1276051e28961 (diff) | |
Merge "Apply given unique docker tag to image"
| -rw-r--r-- | jjb/global-templates-golang.yaml | 3 | ||||
| -rw-r--r-- | jjb/integration/integration-macros.yaml | 8 | ||||
| -rwxr-xr-x | jjb/music/build-music-distributed-kv-store-image.sh | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index 4d48b871f..c85c74ac0 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -169,7 +169,8 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - + - integration-unique-docker-tag: + unique-docker-tag: '' scm: - gerrit-trigger-scm: refspec: '' diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index a6d3695ea..d485b8ed7 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -47,6 +47,14 @@ default: '{terragrunt-version}' description: 'Terragrunt version to install on minion' +- parameter: + name: integration-unique-docker-tag + parameters: + - string: + name: UNIQUE_DOCKER_TAG + default: '{unique-docker-tag}' + description: 'Unique docker tag to identify specific version' + - builder: name: integration-install-robotframework builders: diff --git a/jjb/music/build-music-distributed-kv-store-image.sh b/jjb/music/build-music-distributed-kv-store-image.sh index d11f0534d..69a7785c1 100755 --- a/jjb/music/build-music-distributed-kv-store-image.sh +++ b/jjb/music/build-music-distributed-kv-store-image.sh @@ -1,9 +1,10 @@ #!/bin/bash echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' +echo "============== Unique docker tag: ${UNIQUE_DOCKER_TAG}" CURRENTDIR="$(pwd)" echo $CURRENTDIR chmod 755 ./deployment/*.sh cd ./deployment -./docker-build.sh +./docker-build.sh ${UNIQUE_DOCKER_TAG} |