diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-02-24 19:28:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-24 19:28:00 +0000 |
| commit | 4659235cb7f24612a3c5d1c11e494a6667274b52 (patch) | |
| tree | 35b3d475f233ba57b00e1827a68d898c575370c6 /jjb | |
| parent | 363cd1558a22eed8d12b42d9b1958457511dd611 (diff) | |
| parent | 5d28ee8c16551dfb633b67184eb5e152628bb655 (diff) | |
Merge "Change the docker push to be generic"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/include-docker-push.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 3560ec490..0def78b51 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -708,7 +708,7 @@ - docker.pull.registry=nexus3.openecomp.org:10001 - docker.push.registry=nexus3.openecomp.org:10003 - - shell: !include-raw: include-docker-push.sh + - shell: !include-raw-escape: include-docker-push.sh - job-template: # Job template for Java daily release jobs diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh index ec78d9ab1..929b6a25f 100644 --- a/jjb/include-docker-push.sh +++ b/jjb/include-docker-push.sh @@ -6,5 +6,7 @@ SEARCH="aai-service"; if [[ $PROJECT =~ $SEARCH ]] ; then docker push $DOCKER_REPOSITORY/openecomp/ajsc-aai:latest; else - docker push $DOCKER_REPOSITORY/openecomp/model-loader:latest; + # Cut the prefix aai/ in example aai/model-loader + DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-); + docker push $DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME}:latest; fi |