From 8f77351687ce1bb10420c97ce40dd9fb73e6bd06 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 24 Apr 2017 16:30:26 -0400 Subject: [PATCH] [SDNC-5] Docker tag Update docker tags to match latest ONAP standards Change-Id: I5db0fa66dabc625f6fe5febdf5511a2d33b48c42 Signed-off-by: Dan Timoney Former-commit-id: 3be2dec90f877dbca6c9663410053ae7dd229179 --- installation/admportal/pom.xml | 426 ++++++++++++++++++++++------------------- installation/dgbuilder/pom.xml | 41 +++- installation/sdnc/pom.xml | 77 +++++++- installation/ubuntu/pom.xml | 41 +++- 4 files changed, 382 insertions(+), 203 deletions(-) diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 491af965..1f5c4201 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -1,198 +1,234 @@ - - - org.openecomp.sdnc.oam - installation - 1.1.0-SNAPSHOT - - - 4.0.0 - pom - org.openecomp.sdnc.oam - installation-admportal - 1.1.0-SNAPSHOT - - Installation - admportal - Creates admportal Docker container - - - openecomp/admportal-sdnc-image - - - - - - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - - - - - ${image.name} - - try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile - - ${project.version} - latest - - - - - - - - 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/openecomp/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/openecomp/sdnc - ../../admportal/target/*.zip - - - - - - Copy admportal config - generate-sources - - exec - - - /bin/cp - - ../../admportal/config/admportal.json - ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties - - - - - - Copy admportal config1 - generate-sources - - exec - - - /bin/cp - - ../../admportal/config/admportal.log4js.json - ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties - - - - - - - change shell permissions - process-sources - - exec - - - /usr/bin/find - - ${basedir}/target/docker-stage/opt/openecomp/sdnc - -name - *.sh - -exec - chmod - +x - {} - ; - - - - - - - - - - - - openECOMP - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + + org.openecomp.sdnc.oam + installation + 1.1.0-SNAPSHOT + + + 4.0.0 + pom + org.openecomp.sdnc.oam + installation-admportal + 1.1.0-SNAPSHOT + + Installation - admportal + Creates admportal Docker container + + + openecomp/admportal-sdnc-image + ${project.version} + + + + + + + + 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] + "-SNAPSHOT-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}-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/openecomp/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/openecomp/sdnc + ../../admportal/target/*.zip + + + + + + Copy admportal config + generate-sources + + exec + + + /bin/cp + + ../../admportal/config/admportal.json + ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties + + + + + + Copy admportal config1 + generate-sources + + exec + + + /bin/cp + + ../../admportal/config/admportal.log4js.json + ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties + + + + + + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/opt/openecomp/sdnc + -name + *.sh + -exec + chmod + +x + {} + ; + + + + + + + + + + + + openECOMP + diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index f7a6375d..73963bc6 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -19,6 +19,7 @@ openecomp/dgbuilder-sdnc-image + ${project.version} @@ -26,6 +27,42 @@ + + 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] + "-SNAPSHOT-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 @@ -41,8 +78,8 @@ ${basedir}/target/docker-stage ${basedir}/target/docker-stage/Dockerfile - ${project.version} - latest + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 6efa823c..93d22b64 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -19,6 +19,7 @@ openecomp/sdnc-image + ${project.version} ${project.version} ${project.version} ${project.version} @@ -30,6 +31,42 @@ + + 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] + "-SNAPSHOT-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 @@ -45,8 +82,8 @@ ${basedir}/target/docker-stage ${basedir}/target/docker-stage/Dockerfile - ${project.version} - latest + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} @@ -72,6 +109,38 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + distribution-karaf + 0.5.1-Boron-SR1 + tar.gz + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + maven-resources-plugin 2.6 @@ -115,6 +184,7 @@ + copy-tarballs @@ -128,7 +198,6 @@ src/main/resources *.tgz - *.tar.gz idmlight.db.mv.db false @@ -198,7 +267,7 @@ exec-maven-plugin org.codehaus.mojo - 1.5.0 + 1.5.0 diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml index 5397b4ba..34b74b96 100644 --- a/installation/ubuntu/pom.xml +++ b/installation/ubuntu/pom.xml @@ -19,13 +19,49 @@ openecomp/ubuntu-sdnc-image + ${project.version} + + 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] + "-SNAPSHOT-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 @@ -41,8 +77,9 @@ ${basedir}/target/docker-stage ${basedir}/target/docker-stage/Dockerfile - ${project.version} - latest + ${project.version} + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} -- 2.16.6