From: Timoney, Dan (dt5972) Date: Thu, 14 Feb 2019 21:38:27 +0000 (-0500) Subject: Fix docker tags X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5eadcba086124f49b7cdcc53db4b4622dc2ebd93;p=sdnc%2Foam.git Fix docker tags Fix docker image tags to conform to ONAP standards Change-Id: Id85ab45a3b5a99f215f42177640ed03ab39004bc Issue-ID: SDNC-645 Signed-off-by: Timoney, Dan (dt5972) --- diff --git a/installation/TagVersion.groovy b/installation/TagVersion.groovy new file mode 100644 index 00000000..9daac313 --- /dev/null +++ b/installation/TagVersion.groovy @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP SDNC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * + */ + +package org.onap.sdnc.oam + + +def versionArray; +if ( project.properties['sdnc.project.version'] != null ) { + versionArray = project.properties['sdnc.project.version'].split('\\.'); +} + +if ( project.properties['sdnc.project.version'].endsWith("-SNAPSHOT") ) { + patchArray = versionArray[2].split('-'); + project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"; + project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest"; + project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['sdnc.build.timestamp']; +} else { + project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest"; + project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['sdnc.build.timestamp']; +} diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 21bb37ff..43ff0b60 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -1,231 +1,218 @@ - - - - org.onap.ccsdk.parent - odlparent-lite - 1.2.1-SNAPSHOT - - - 4.0.0 - pom - org.onap.sdnc.oam - installation-admportal - 1.5.0-SNAPSHOT - - sdnc-oam :: installation :: ${project.artifactId} - Creates admportal Docker container - - - onap/admportal-sdnc-image - ${project.version} - 0.4-STAGING-latest + + + + org.onap.ccsdk.parent + odlparent-lite + 1.2.1-SNAPSHOT + + + 4.0.0 + pom + org.onap.sdnc.oam + installation-admportal + 1.5.0-SNAPSHOT + + sdnc-oam :: installation :: ${project.artifactId} + Creates admportal Docker container + + + onap/admportal-sdnc-image + ${project.version} + ${maven.build.timestamp} + 0.4-STAGING-latest yyyyMMdd'T'HHmmss'Z' - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + - project.properties['project.docker.latesttag.version']; - - - - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - - - - - ${image.name} - - try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - generate-images - generate-sources - - build - - - - - push-images - deploy - - build - push - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - copy-properties - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties - - - ../src/main/properties - - *.properties - *.properties.sdnctldb01 - - false - - - - - - - - exec-maven-plugin - org.codehaus.mojo - 1.5.0 - - - Unzip admportal - generate-sources - - exec - - - /usr/bin/unzip - - -d - ${basedir}/target/docker-stage/opt/onap/sdnc - ../../admportal/target/*.zip - - - - - - Copy admportal config - generate-sources - - exec - - - /bin/cp - - ../../admportal/config/admportal.json - ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties - - - - - - Copy admportal config1 - generate-sources - - exec - - - /bin/cp - - ../../admportal/config/admportal.log4js.json - ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties - - - - - - - change shell permissions - process-sources - - exec - - - /usr/bin/find - - ${basedir}/target/docker-stage/opt/onap/sdnc - -name - *.sh - -exec - chmod - +x - {} - ; - - - - - - - - - - - - openECOMP - + + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../TagVersion.groovy + + + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + + ${image.name} + + try + ${basedir}/target/docker-stage + ${basedir}/target/docker-stage/Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + + + + generate-images + generate-sources + + build + + + + + push-images + deploy + + build + push + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + copy-properties + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties + + + ../src/main/properties + + *.properties + *.properties.sdnctldb01 + + false + + + + + + + + exec-maven-plugin + org.codehaus.mojo + 1.5.0 + + + Unzip admportal + generate-sources + + exec + + + /usr/bin/unzip + + -d + ${basedir}/target/docker-stage/opt/onap/sdnc + ../../admportal/target/*.zip + + + + + + Copy admportal config + generate-sources + + exec + + + /bin/cp + + ../../admportal/config/admportal.json + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties + + + + + + Copy admportal config1 + generate-sources + + exec + + + /bin/cp + + ../../admportal/config/admportal.log4js.json + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties + + + + + + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/opt/onap/sdnc + -name + *.sh + -exec + chmod + +x + {} + ; + + + + + + + + + + + + openECOMP + diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 3c22fd7a..c8876ceb 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -1,5 +1,7 @@ - + org.onap.ccsdk.parent @@ -18,6 +20,7 @@ onap/sdnc-ansible-server-image ${project.version} + ${maven.build.timestamp} 0.4-STAGING-latest ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -36,22 +39,7 @@ execute - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - + ${basedir}/../TagVersion.groovy @@ -104,9 +92,9 @@ ${basedir}/target/docker-stage ${basedir}/target/docker-stage/Dockerfile - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index d0c235f5..6c498c30 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -1,5 +1,7 @@ - + org.onap.ccsdk.parent @@ -18,6 +20,7 @@ onap/sdnc-dmaap-listener-image ${project.version} + ${maven.build.timestamp} 0.4-STAGING-latest ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -38,22 +41,7 @@ execute - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - + ${basedir}/../TagVersion.groovy @@ -208,9 +196,9 @@ ${basedir}/target/docker-stage Dockerfile - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 9c69c9eb..1bd31681 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -19,6 +19,7 @@ onap/sdnc-image ${project.version} + ${maven.build.timestamp} 1.5.0-SNAPSHOT 0.4-STAGING-latest ${https_proxy} @@ -72,21 +73,7 @@ execute - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - + ${basedir}/../TagVersion.groovy @@ -106,9 +93,9 @@ ${basedir}/target/docker-stage Dockerfile - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 80c31693..828940c9 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -1,5 +1,7 @@ - + org.onap.ccsdk.parent @@ -17,10 +19,11 @@ onap/sdnc-ueb-listener-image - ${project.version} + ${project.version} + ${maven.build.timestamp} 0.4-STAGING-latest ${https_proxy} - deploy + deploy yyyyMMdd'T'HHmmss'Z' @@ -39,22 +42,7 @@ execute - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - + ${basedir}/../TagVersion.groovy @@ -209,9 +197,9 @@ ${basedir}/target/docker-stage Dockerfile - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} @@ -228,7 +216,7 @@ push-images - + ${docker.push.phase} build