From: Dan Timoney Date: Wed, 13 Feb 2019 18:40:09 +0000 (+0000) Subject: Merge "Changes in RestServer.py" X-Git-Tag: 0.4.1~11 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=f4089a2309fecb01e6e3ef06e03991a6be02e2d9;hp=1b3e909f413e81a50cb5f44e187ea3cdd1e32f69 Merge "Changes in RestServer.py" --- diff --git a/alpine/pom.xml b/alpine/pom.xml index 8e3a1642..3aebe954 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -21,6 +21,7 @@ onap/ccsdk-alpine-image ${project.version} + ${maven.build.timestamp} @@ -35,24 +36,8 @@ execute - - - println project.properties['ccsdk.project.version']; - def versionArray; - if ( project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.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}/../src/main/scripts/TagVersion.groovy @@ -106,9 +91,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/ansible-server/pom.xml b/ansible-server/pom.xml index a8092026..662864cb 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -1,170 +1,158 @@ - + - - org.onap.ccsdk.parent - odlparent-lite - 1.2.1-SNAPSHOT - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.1-SNAPSHOT + - 4.0.0 - pom - org.onap.ccsdk.distribution - ansible-server - 0.4.1-SNAPSHOT + 4.0.0 + pom + org.onap.ccsdk.distribution + ansible-server + 0.4.1-SNAPSHOT - ccsdk :: distribution :: ${project.artifactId} - Creates ansible-server Docker container + ccsdk :: distribution :: ${project.artifactId} + Creates ansible-server Docker container - - onap/ccsdk-ansible-server-image - ${project.version} - ${project.version} - yyyyMMdd'T'HHmmss'Z' - true - + + onap/ccsdk-ansible-server-image + ${project.version} + ${maven.build.timestamp} + ${project.version} + yyyyMMdd'T'HHmmss'Z' + true + - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['ccsdk.project.version']; - def versionArray; - if ( project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../src/main/scripts/TagVersion.groovy + + + + - if (project.properties['ccsdk.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"; - } + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main + + **/* + + false + + + + + + - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - - - - - + + exec-maven-plugin + org.codehaus.mojo + 1.5.0 + + + change python permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/ansible-server + -name + *.py + -exec + chmod + +x + {} + ; + + + + + + + - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main - - **/* - - false - - - - - - + + + docker + + + + 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 + package + + build + + - - exec-maven-plugin - org.codehaus.mojo - 1.5.0 - - - change python permissions - process-sources - - exec - - - /usr/bin/find - - ${basedir}/target/docker-stage/ansible-server - -name - *.py - -exec - chmod - +x - {} - ; - - - - - - - - - - - docker - - - - 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 - package - - build - - - - - push-images - deploy - - build - push - - - - - - - - - - ONAP - + + push-images + deploy + + build + push + + + + + + + + + + ONAP + diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile index 0555e7d9..e0abb04a 100644 --- a/ansible-server/src/main/Dockerfile +++ b/ansible-server/src/main/Dockerfile @@ -22,6 +22,8 @@ COPY configuration/ansible.cfg /etc/ansible/ansible.cfg WORKDIR /opt/ansible-server +RUN mkdir /opt/onap ; ln -s /opt/ansible-server /opt/onap/ccsdk + EXPOSE 8000 ENTRYPOINT ["python2", "RestServer.py"] diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 998bc3b5..2c160fc5 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -22,43 +24,28 @@ onap/ccsdk-dgbuilder-image ${project.version} + ${maven.build.timestamp} - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['ccsdk.project.version']; - def versionArray; - if ( project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.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']; - - - - - + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../src/main/scripts/TagVersion.groovy + + + + maven-resources-plugin 2.6 @@ -90,35 +77,35 @@ exec-maven-plugin 1.5.0 - - Make-stage-dir - generate-sources - - exec - - - /bin/mkdir - - -p - ${basedir}/target/docker-stage/opt/onap/ccsdk - - - - - Unzip dgbuilder - generate-sources - - exec - - - /usr/bin/unzip - - -d - ${basedir}/target/docker-stage/opt/onap/ccsdk - ../dgbuilder/target/*.zip - - - + + Make-stage-dir + generate-sources + + exec + + + /bin/mkdir + + -p + ${basedir}/target/docker-stage/opt/onap/ccsdk + + + + + Unzip dgbuilder + generate-sources + + exec + + + /usr/bin/unzip + + -d + ${basedir}/target/docker-stage/opt/onap/ccsdk + ../dgbuilder/target/*.zip + + + Copy dgbuilder generate-sources @@ -154,7 +141,7 @@ change shell permissions - process-sources + process-sources exec @@ -175,57 +162,57 @@ - + - - docker - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - + + docker + + + + 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 - package - - build - - + + + ${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 + package + + build + + - - push-images - deploy - - build - push - - - - - - - - + + push-images + deploy + + build + push + + + + + + + + diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile index 675e37a6..90ade01f 100644 --- a/dgbuilder-docker/src/main/docker/Dockerfile +++ b/dgbuilder-docker/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${project.version} +FROM onap/ccsdk-ubuntu-image:${project.docker.latestfulltag.version} MAINTAINER CCSDK Team (onap-discuss@lists.onap.org) # copy onap diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 20ddba50..9bdb24e3 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -11,21 +11,23 @@ Version: 0.3.3 ** Bug Fixes ** The following bugs are fixed in the CCSDK Casablanca January 2019 maintenance release: -+-------------+--------------------------------------------------------------------+ -| Jira # | Abstract | -+=============+====================================================================+ -| [CCSDK-727] | Do not prepend "sub" for subnet net id | -+-------------+--------------------------------------------------------------------+ -| [CCSDK-728] | Self serve DG adjustement for unassign | -+-------------+--------------------------------------------------------------------+ -| [CCSDK-740] | Restore inventory-response-item definition to the original version | -+-------------+--------------------------------------------------------------------+ -| [CCSDK-765] | Upgrade jackson version to 2.8.9 | -+-------------+--------------------------------------------------------------------+ -| [CCSDK-777] | Release version contains some snapshots | -+-------------+--------------------------------------------------------------------+ -| [CCSDK-843] | Compile error due to old snapshot dependency | -+-------------+--------------------------------------------------------------------+ ++-------------+-------------------------------------------------------------------------------+ +| Jira # | Abstract | ++=============+===============================================================================+ +| [CCSDK-727] | Do not prepend "sub" for subnet net id | ++-------------+-------------------------------------------------------------------------------+ +| [CCSDK-728] | Self serve DG adjustement for unassign | ++-------------+-------------------------------------------------------------------------------+ +| [CCSDK-740] | Restore inventory-response-item definition to the original version | ++-------------+-------------------------------------------------------------------------------+ +| [CCSDK-765] | Upgrade jackson version to 2.8.9 | ++-------------+-------------------------------------------------------------------------------+ +| [CCSDK-777] | Release version contains some snapshots | ++-------------+-------------------------------------------------------------------------------+ +| [CCSDK-843] | Compile error due to old snapshot dependency | ++-------------+-------------------------------------------------------------------------------+ +| [CCSDK-935] | restapicall JsonParser failed if response contains : as part of response body | ++-------------+-------------------------------------------------------------------------------+ **Known Issues** The full list of known issues in CCSDK may be found in the ONAP Jira at diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 89207a96..58f71a9d 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -24,6 +24,7 @@ onap/ccsdk-odl-fluorine-alpine-image onap/ccsdk-odlsli-alpine-image ${project.version} + ${maven.build.timestamp} ${project.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -258,22 +259,7 @@ execute - - println project.properties['ccsdk.project.version']; - def versionArray; - if (project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.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}/../../src/main/scripts/TagVersion.groovy @@ -513,9 +499,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/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index 47b12081..b9054670 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM ${base.image.name}:${project.version} +FROM ${base.image.name}:${project.docker.latestfulltag.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV ODL_HOME /opt/opendaylight diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index 488692c9..8b26b490 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -24,6 +24,7 @@ onap/ccsdk-odl-fluorine-ubuntu-image onap/ccsdk-odlsli-image ${project.version} + ${maven.build.timestamp} ${project.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -258,22 +259,7 @@ execute - - println project.properties['ccsdk.project.version']; - def versionArray; - if (project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.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}/../../src/main/scripts/TagVersion.groovy @@ -513,9 +499,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/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile index fd95cba6..d5460e4b 100644 --- a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile +++ b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM ${base.image.name}:${project.version} +FROM ${base.image.name}:${project.docker.latestfulltag.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV ODL_HOME /opt/opendaylight @@ -10,6 +10,8 @@ ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.f ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features ENV ANSIBLE_GPG_KEY ${ansible.gpg.key} +ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra} + # copy the opendaylight credentials COPY idmlight.db.mv.db $ODL_HOME/data diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml index 477effa6..2d3083d6 100644 --- a/opendaylight/fluorine/fluorine-alpine/pom.xml +++ b/opendaylight/fluorine/fluorine-alpine/pom.xml @@ -1,221 +1,209 @@ - - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-odl-fluorine - 0.4.1-SNAPSHOT - - - distribution-odl-fluorine-alpine - 0.4.1-SNAPSHOT - pom - - ccsdk-distribution :: opendaylight :: ${project.artifactId} - Creates OpenDaylight container - - ONAP - - - - onap/ccsdk-odl-fluorine-alpine-image - ${project.version} - 0.9.1 - 2.1.1 - ${https_proxy} - deploy - - - - - - org.opendaylight.integration - karaf - ${ccsdk.opendaylight.version} - tar.gz - - - org.mariadb.jdbc - mariadb-java-client - ${ccsdk.mariadb-connector-java.version} - jar - - - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['ccsdk.project.version']; - def versionArray; - if (project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.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']; - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - get-odl-distribution - validate - - copy - - - - - org.opendaylight.integration - karaf - ${ccsdk.opendaylight.version} - tar.gz - - true - ${basedir}/target/docker-stage - - - false - true - true - - - - - get-mariadb-connector-jar - validate - - copy - - - - - org.mariadb.jdbc - mariadb-java-client - ${ccsdk.mariadb-connector-java.version} - jar - true - ${basedir}/target/docker-stage - - - false - true - true - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - - - - - - - - - - docker - - - - 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 - package - - build - - - - - push-images - ${docker.push.phase} - - build - push - - - - - - - - - - + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-odl-fluorine + 0.4.1-SNAPSHOT + + + distribution-odl-fluorine-alpine + 0.4.1-SNAPSHOT + pom + + ccsdk-distribution :: opendaylight :: ${project.artifactId} + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-fluorine-alpine-image + ${project.version} + ${maven.build.timestamp} + 0.9.1 + 2.1.1 + ${https_proxy} + deploy + + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-connector-java.version} + jar + + + + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../../../src/main/scripts/TagVersion.groovy + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + get-mariadb-connector-jar + validate + + copy + + + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-connector-java.version} + jar + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + + + + + + + + + docker + + + + 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 + package + + build + + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + + diff --git a/opendaylight/fluorine/fluorine-alpine/src/main/docker/Dockerfile b/opendaylight/fluorine/fluorine-alpine/src/main/docker/Dockerfile index dc7736dd..a043e1e9 100644 --- a/opendaylight/fluorine/fluorine-alpine/src/main/docker/Dockerfile +++ b/opendaylight/fluorine/fluorine-alpine/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-alpine-image:${project.version} +FROM onap/ccsdk-alpine-image:${project.docker.latestfulltag.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV ODL_HOME /opt/opendaylight/current diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml index d1849571..c48a4150 100644 --- a/opendaylight/fluorine/fluorine-ubuntu/pom.xml +++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml @@ -1,221 +1,209 @@ - - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-odl-fluorine - 0.4.1-SNAPSHOT - - - distribution-odl-fluorine-ubuntu - 0.4.1-SNAPSHOT - pom - - ccsdk-distribution :: opendaylight :: ${project.artifactId} - Creates OpenDaylight container - - ONAP - - - - onap/ccsdk-odl-fluorine-ubuntu-image - ${project.version} - 0.9.1 - 2.1.1 - ${https_proxy} - deploy - - - - - - org.opendaylight.integration - karaf - ${ccsdk.opendaylight.version} - tar.gz - - - org.mariadb.jdbc - mariadb-java-client - ${ccsdk.mariadb-connector-java.version} - jar - - - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['ccsdk.project.version']; - def versionArray; - if (project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.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']; - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - get-odl-distribution - validate - - copy - - - - - org.opendaylight.integration - karaf - ${ccsdk.opendaylight.version} - tar.gz - - true - ${basedir}/target/docker-stage - - - false - true - true - - - - - get-mariadb-connector-jar - validate - - copy - - - - - org.mariadb.jdbc - mariadb-java-client - ${ccsdk.mariadb-connector-java.version} - jar - true - ${basedir}/target/docker-stage - - - false - true - true - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - - - - - - - - - - docker - - - - 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 - package - - build - - - - - push-images - ${docker.push.phase} - - build - push - - - - - - - - - - + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-odl-fluorine + 0.4.1-SNAPSHOT + + + distribution-odl-fluorine-ubuntu + 0.4.1-SNAPSHOT + pom + + ccsdk-distribution :: opendaylight :: ${project.artifactId} + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-fluorine-ubuntu-image + ${project.version} + ${maven.build.timestamp} + 0.9.1 + 2.1.1 + ${https_proxy} + deploy + + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-connector-java.version} + jar + + + + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../../../src/main/scripts/TagVersion.groovy + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + get-mariadb-connector-jar + validate + + copy + + + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-connector-java.version} + jar + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + + + + + + + + + docker + + + + 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 + package + + build + + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + + diff --git a/opendaylight/fluorine/fluorine-ubuntu/src/main/docker/Dockerfile b/opendaylight/fluorine/fluorine-ubuntu/src/main/docker/Dockerfile index 93811de9..9c9fec0f 100644 --- a/opendaylight/fluorine/fluorine-ubuntu/src/main/docker/Dockerfile +++ b/opendaylight/fluorine/fluorine-ubuntu/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${project.version} +FROM onap/ccsdk-ubuntu-image:${project.docker.latestfulltag.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV ODL_HOME /opt/opendaylight/current diff --git a/pom.xml b/pom.xml index 851307b6..85ed8a53 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ dgbuilder dgbuilder-docker ansible-server + saltstack-server diff --git a/saltstack-server/README.md b/saltstack-server/README.md new file mode 100644 index 00000000..69e47ec4 --- /dev/null +++ b/saltstack-server/README.md @@ -0,0 +1,331 @@ +''' +/*- +* ============LICENSE_START======================================================= +* ONAP : CCSDK +* ================================================================================ +* Copyright (C) 2018 Samsung Electronics. 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========================================================= +*/ +''' +USING VAGRANT for CREATING SALTSTACK SERVER + +a. The SaltStack server should have it’s SSH enabled. +b. Via ssh user account we should have the access to run saltstack command (here we will see how to enable root access via ssh and connect to server via root user). +============ +INSTALLATION: Saltstack DEMO Environment creation: +============ + +1, Install VirtualBox. +2, Install Vagrant. +3, Download https://github.com/UtahDave/salt-vagrant-demo. You can use git or download a zip of the project directly from GitHub (sample Vagrant attached). +4, Extract the zip file you downloaded, and then open a command prompt to the extracted directory. +5, Run vagrant up to start the demo environment: vagrant up + After Vagrant ups (~10 minutes) and you are back at the command prompt, you are ready to continue. + More info: https://docs.saltstack.com/en/getstarted/fundamentals/ + +============ +Configuration: Sample Saltstack server execution configuration requirement. +============ +1, login to Master Saltstack server node: +"sudo vi /etc/ssh/sshd_config" and SET the following +PermitEmptyPasswords yes +PermitRootLogin yes + +SAVE and close. + +2, Run: "sudo passwd root" +and set the root password. +Then run: "sudo reboot" + +3, On the host machine, open the virtual box set a port forwarding to the master server for 2222 -> 22 +This will redirect messages to host machine to the Vagarant Master server. + +============ +TESTING: Sample Saltstack server command execution. +============ + + @Test + public void reqExecCommand_shouldSetSuccessReal() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", "127.0.0.1"); + params.put("Port", "22"); + params.put("User", "sdn"); + params.put("Password", "foo"); + params.put("Id", "test1"); + params.put("Cmd", "ls -l"); + params.put("SlsExec", "false"); + params.put("Timeout", "12000"); + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecCommand(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if local ssh is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessRealSLSCommand() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("Cmd", "salt '*' test.ping --out=json --static"); + params.put("SlsExec", "false"); + params.put("Timeout", "12000"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecCommand(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + TestId = svcContext.getAttribute("test1.minion1"); + assertEquals(TestId, "true"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessRealCommand() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("Cmd", "cd /srv/salt/; salt '*' state.apply vim --out=json --static"); + params.put("SlsExec", "true"); + params.put("Timeout", "12000"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecCommand(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessRealSSL() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("SlsName", "vim"); + params.put("Timeout", "12000"); + params.put("NodeList", "minion1"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessEnvParam() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("SlsName", "vim"); + params.put("Timeout", "12000"); + params.put("NodeList", "minion1"); + params.put("EnvParameters", "{\"exclude\": bar*}"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessFileParam() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("SlsName", "vim"); + params.put("Timeout", "12000"); + params.put("NodeList", "minion1"); + params.put("EnvParameters", "{\"exclude\": \"bar,baz\"}"); + params.put("FileParameters", "{\"config.txt\":\"db_ip=10.1.1.1, sip_timer=10000\"}"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessPillarParam() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("SlsName", "vim"); + params.put("Timeout", "12000"); + params.put("NodeList", "minion1"); + params.put("EnvParameters", "{\"exclude\": \"bar,baz\", \"pillar\":\"'{\\\"foo\\\": \\\"bar\\\"}'\"}"); + params.put("FileParameters", "{\"config.txt\":\"db_ip=10.1.1.1, sip_timer=10000\"}"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessMultiFileParam() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("SlsName", "vim"); + params.put("Timeout", "12000"); + params.put("NodeList", "minion1"); + params.put("EnvParameters", "{\"exclude\": bar*}"); + params.put("FileParameters", "{\"config.txt\":\"db_ip=10.1.1.1, sip_timer=10000\" , \"config-tep.txt\":\"db_ip=10.1.1.1, sip_timer=10000\"}"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessSSLFile() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("Timeout", "12000"); + params.put("NodeList", "minion1"); + params.put("SlsFile", "src/test/resources/config.sls"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLSFile(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessSSLFileMultiFileParam() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("Timeout", "12000"); + params.put("NodeList", "minion1"); + params.put("SlsFile", "src/test/resources/config.sls"); + params.put("EnvParameters", "{\"exclude\": bar, \"pillar\":\"'{\\\"foo\\\": \\\"bar\\\"}'\"}"); + params.put("FileParameters", "{\"config.txt\":\"db_ip=10.1.1.1, sip_timer=10000\" , \"config-tep.txt\":\"db_ip=10.1.1.1, sip_timer=10000\"}"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLSFile(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } \ No newline at end of file diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml new file mode 100644 index 00000000..b6d27010 --- /dev/null +++ b/saltstack-server/pom.xml @@ -0,0 +1,123 @@ + + + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-root + 0.4.1-SNAPSHOT + + + saltstack-server + 0.4.1-SNAPSHOT + pom + + ccsdk-distribution :: saltstack-server + Creates base saltstack-server Docker container + + + onap/ccsdk-saltstack-server-image + ${project.version} + ${maven.build.timestamp} + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../src/main/scripts/TagVersion.groovy + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.26.0 + false + + + + + ${image.name} + + try + ${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 + + + + + + + + + + diff --git a/saltstack-server/src/main/docker/Dockerfile b/saltstack-server/src/main/docker/Dockerfile new file mode 100644 index 00000000..f2e486eb --- /dev/null +++ b/saltstack-server/src/main/docker/Dockerfile @@ -0,0 +1,13 @@ +FROM centos:7 + + +RUN yum clean all && \ + yum install -y yum install epel-release && \ + yum install -y https://repo.saltstack.com/yum/redhat/salt-repo-latest-1.el7.noarch.rpm && \ + yum update -y && \ + yum install -y sudo git tmux vim salt-master salt-minion && \ + yum clean all + +EXPOSE 4505 4506 + +CMD /usr/bin/salt-master -d; /bin/bash \ No newline at end of file diff --git a/saltstack-server/src/main/vagrant/Vagrantfile-sample b/saltstack-server/src/main/vagrant/Vagrantfile-sample new file mode 100644 index 00000000..5fbcfbb7 --- /dev/null +++ b/saltstack-server/src/main/vagrant/Vagrantfile-sample @@ -0,0 +1,69 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + os = "bento/ubuntu-16.04" + net_ip = "192.168.50" + + config.vm.define :master, primary: true do |master_config| + master_config.vm.provider "virtualbox" do |vb| + vb.memory = "2048" + vb.cpus = 1 + vb.name = "master" + end + master_config.vm.box = "#{os}" + master_config.vm.host_name = 'saltmaster.local' + master_config.vm.network "private_network", ip: "#{net_ip}.10" + master_config.vm.synced_folder "saltstack/salt/", "/srv/salt" + master_config.vm.synced_folder "saltstack/pillar/", "/srv/pillar" + + master_config.vm.provision :salt do |salt| + salt.master_config = "saltstack/etc/master" + salt.master_key = "saltstack/keys/master_minion.pem" + salt.master_pub = "saltstack/keys/master_minion.pub" + salt.minion_key = "saltstack/keys/master_minion.pem" + salt.minion_pub = "saltstack/keys/master_minion.pub" + salt.seed_master = { + "minion1" => "saltstack/keys/minion1.pub", + "minion2" => "saltstack/keys/minion2.pub" + } + + salt.install_type = "stable" + salt.install_master = true + salt.no_minion = true + salt.verbose = true + salt.colorize = true + salt.bootstrap_options = "-P -c /tmp" + end + end + + + [ + ["minion1", "#{net_ip}.11", "1024", os ], + ["minion2", "#{net_ip}.12", "1024", os ], + ].each do |vmname,ip,mem,os| + config.vm.define "#{vmname}" do |minion_config| + minion_config.vm.provider "virtualbox" do |vb| + vb.memory = "#{mem}" + vb.cpus = 1 + vb.name = "#{vmname}" + end + minion_config.vm.box = "#{os}" + minion_config.vm.hostname = "#{vmname}" + minion_config.vm.network "private_network", ip: "#{ip}" + + minion_config.vm.provision :salt do |salt| + salt.minion_config = "saltstack/etc/#{vmname}" + salt.minion_key = "saltstack/keys/#{vmname}.pem" + salt.minion_pub = "saltstack/keys/#{vmname}.pub" + salt.install_type = "stable" + salt.verbose = true + salt.colorize = true + salt.bootstrap_options = "-P -c /tmp" + end + end + end + end \ No newline at end of file diff --git a/saltstack-server/src/main/vagrant/saltstack_sample_sls-2.yml b/saltstack-server/src/main/vagrant/saltstack_sample_sls-2.yml new file mode 100644 index 00000000..b96773e1 --- /dev/null +++ b/saltstack-server/src/main/vagrant/saltstack_sample_sls-2.yml @@ -0,0 +1,34 @@ +# /*- +# * ============LICENSE_START======================================================= +# * ONAP : CCSDK +# * ================================================================================ +# * Copyright (C) 2018 Samsung Electronics. 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========================================================= +# */ + +my-vim: + git.latest: + - name: https://github.com/nbari/my-vim + - target: /usr/local/share/my-vim + - rev: master + - submodules: True + cmd.wait: + - name: 'cd /usr/local/share/my-vim; git submodule init; git submodule foreach git pull origin master; git submodule update' + - watch: + - git: my-vim \ No newline at end of file diff --git a/saltstack-server/src/main/vagrant/saltstact_sample_sls.yml b/saltstack-server/src/main/vagrant/saltstact_sample_sls.yml new file mode 100644 index 00000000..84cc917b --- /dev/null +++ b/saltstack-server/src/main/vagrant/saltstact_sample_sls.yml @@ -0,0 +1,26 @@ +# /*- +# * ============LICENSE_START======================================================= +# * ONAP : CCSDK +# * ================================================================================ +# * Copyright (C) 2018 Samsung Electronics. 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========================================================= +# */ + +vim: + pkg.installed diff --git a/src/main/scripts/TagVersion.groovy b/src/main/scripts/TagVersion.groovy new file mode 100644 index 00000000..68a8b780 --- /dev/null +++ b/src/main/scripts/TagVersion.groovy @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CCSDK + * ================================================================================ + * 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.ccsdk.distribution + + +def versionArray; +if ( project.properties['ccsdk.project.version'] != null ) { + versionArray = project.properties['ccsdk.project.version'].split('\\.'); +} + +if ( project.properties['ccsdk.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['ccsdk.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['ccsdk.build.timestamp']; +} diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index 8f17a987..c4f53b2f 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -21,6 +21,8 @@ onap/ccsdk-ubuntu-image ${project.version} + ${maven.build.timestamp} + ${project.version} @@ -36,23 +38,7 @@ execute - - println project.properties['ccsdk.project.version']; - def versionArray; - if ( project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.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}/../src/main/scripts/TagVersion.groovy @@ -106,9 +92,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}