diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/admportal/pom.xml | 422 | ||||
| -rw-r--r-- | installation/dgbuilder/pom.xml | 55 | ||||
| -rw-r--r-- | installation/dgbuilder/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | installation/pom.xml | 4 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 75 | ||||
| -rw-r--r--[-rwxr-xr-x] | installation/sdnc/src/main/scripts/installFeatures.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | installation/sdnc/src/main/scripts/installSdncDb.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | installation/sdnc/src/main/scripts/startODL.sh | 0 | ||||
| -rw-r--r-- | installation/ubuntu/pom.xml | 40 |
9 files changed, 387 insertions, 211 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 491af965..88ac89d1 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -1,198 +1,230 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.openecomp.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.1.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> - <artifactId>installation-admportal</artifactId> - <version>1.1.0-SNAPSHOT</version> - - <name>Installation - admportal</name> - <description>Creates admportal Docker container</description> - - <properties> - <image.name>openecomp/admportal-sdnc-image</image.name> - </properties> - - - <build> - <plugins> - - - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.16.5</version> - <inherited>false</inherited> - <configuration> - - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> - <tags> - <tag>${project.version}</tag> - <tag>latest</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>generate-sources</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <includes> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-properties</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory> - <resources> - <resource> - <directory>../src/main/properties</directory> - <includes> - <include>*.properties</include> - <include>*.properties.sdnctldb01</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>exec-maven-plugin</artifactId> - <groupId>org.codehaus.mojo</groupId> - <version>1.5.0</version> - <executions> - <execution> - <id>Unzip admportal</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/unzip</executable> - <arguments> - <argument>-d</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> - <argument>../../admportal/target/*.zip</argument> - </arguments> - </configuration> - </execution> - - <execution> - <id>Copy admportal config</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/cp</executable> - <arguments> - <argument>../../admportal/config/admportal.json</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument> - </arguments> - </configuration> - </execution> - - <execution> - <id>Copy admportal config1</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/cp</executable> - <arguments> - <argument>../../admportal/config/admportal.log4js.json</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument> - </arguments> - </configuration> - </execution> - - - <execution> - <id>change shell permissions</id> - <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> - <argument>-name</argument> - <argument>*.sh</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - - - </plugins> - - </build> - <organization> - <name>openECOMP</name> - </organization> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.openecomp.sdnc.oam</groupId> + <artifactId>installation</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <groupId>org.openecomp.sdnc.oam</groupId> + <artifactId>installation-admportal</artifactId> + <version>1.1.1-SNAPSHOT</version> + + <name>Installation - admportal</name> + <description>Creates admportal Docker container</description> + + <properties> + <image.name>openecomp/admportal-sdnc-image</image.name> + <sdnc.project.version>${project.version}</sdnc.project.version> + </properties> + + + <build> + <plugins> + + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + 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']; + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.16.5</version> + <inherited>false</inherited> + <configuration> + + <images> + <image> + <name>${image.name}</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> + <tags> + <tag>${project.version}</tag> + <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>generate-images</id> + <phase>generate-sources</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-dockerfile</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>Dockerfile</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-properties</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory> + <resources> + <resource> + <directory>../src/main/properties</directory> + <includes> + <include>*.properties</include> + <include>*.properties.sdnctldb01</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <version>1.5.0</version> + <executions> + <execution> + <id>Unzip admportal</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/usr/bin/unzip</executable> + <arguments> + <argument>-d</argument> + <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>../../admportal/target/*.zip</argument> + </arguments> + </configuration> + </execution> + + <execution> + <id>Copy admportal config</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/bin/cp</executable> + <arguments> + <argument>../../admportal/config/admportal.json</argument> + <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument> + </arguments> + </configuration> + </execution> + + <execution> + <id>Copy admportal config1</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/bin/cp</executable> + <arguments> + <argument>../../admportal/config/admportal.log4js.json</argument> + <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument> + </arguments> + </configuration> + </execution> + + + <execution> + <id>change shell permissions</id> + <phase>process-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/usr/bin/find</executable> + <arguments> + <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>-name</argument> + <argument>*.sh</argument> + <argument>-exec</argument> + <argument>chmod</argument> + <argument>+x</argument> + <argument>{}</argument> + <argument>;</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + + + </plugins> + + </build> + <organization> + <name>openECOMP</name> + </organization> </project> diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index f7a6375d..c89c766a 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -5,20 +5,21 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation-dgbuilder</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <name>Installation - dgbuilder</name> <description>Creates docker container for dgbuilder</description> <properties> <image.name>openecomp/dgbuilder-sdnc-image</image.name> + <sdnc.project.version>${project.version}</sdnc.project.version> </properties> @@ -27,6 +28,37 @@ <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + 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']; + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>0.16.5</version> @@ -42,7 +74,8 @@ <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> <tags> <tag>${project.version}</tag> - <tag>latest</tag> + <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> </tags> </build> </image> @@ -51,7 +84,7 @@ <executions> <execution> <id>generate-images</id> - <phase>generate-sources</phase> + <phase>package</phase> <goals> <goal>build</goal> </goals> @@ -99,6 +132,20 @@ <version>1.5.0</version> <executions> <execution> + <id>Make-stage-dir</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/bin/mkdir</executable> + <arguments> + <argument>-p</argument> + <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + </arguments> + </configuration> + </execution> + <execution> <id>Unzip dgbuilder</id> <phase>generate-sources</phase> <goals> diff --git a/installation/dgbuilder/src/main/docker/Dockerfile b/installation/dgbuilder/src/main/docker/Dockerfile index fa976335..f3c0e815 100644 --- a/installation/dgbuilder/src/main/docker/Dockerfile +++ b/installation/dgbuilder/src/main/docker/Dockerfile @@ -7,7 +7,7 @@ COPY opt /opt WORKDIR /opt/openecomp/sdnc/dgbuilder # Set the proxy if needed # RUN npm config set proxy http://your.proxy.com:8080 -RUN npm install +#RUN npm install #ENTRYPOINT /bin/bash /opt/openecomp/sdnc/dgbuilder/start sdnc1.0 EXPOSE 3100 diff --git a/installation/pom.xml b/installation/pom.xml index c239fd38..b8c5c81e 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <name>Installation</name> <description>Installs SDN-C on local file system</description> diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 6efa823c..808d8b99 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,20 +5,21 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation-sdnc</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <name>Installation - sdnc</name> <description>Creates SDN Controller Docker container</description> <properties> <image.name>openecomp/sdnc-image</image.name> + <sdnc.project.version>${project.version}</sdnc.project.version> <sdnc.core.version>${project.version}</sdnc.core.version> <sdnc.adaptors.version>${project.version}</sdnc.adaptors.version> <sdnc.northbound.version>${project.version}</sdnc.northbound.version> @@ -31,6 +32,37 @@ <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + 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']; + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>0.16.5</version> @@ -46,7 +78,8 @@ <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> <tags> <tag>${project.version}</tag> - <tag>latest</tag> + <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> </tags> </build> </image> @@ -72,6 +105,38 @@ </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>get-odl-distribution</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.opendaylight.integration</groupId> + <artifactId>distribution-karaf</artifactId> + <version>0.5.1-Boron-SR1</version> + <type>tar.gz</type> + + <overWrite>true</overWrite> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> @@ -115,6 +180,7 @@ </resources> </configuration> </execution> + <execution> <id>copy-tarballs</id> <goals> @@ -128,7 +194,6 @@ <directory>src/main/resources</directory> <includes> <include>*.tgz</include> - <include>*.tar.gz</include> <include>idmlight.db.mv.db</include> </includes> <filtering>false</filtering> @@ -198,7 +263,7 @@ <plugin> <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> - <version>1.5.0</version> + <version>1.5.0</version> <executions> <execution> diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh index 91b71fc6..91b71fc6 100755..100644 --- a/installation/sdnc/src/main/scripts/installFeatures.sh +++ b/installation/sdnc/src/main/scripts/installFeatures.sh diff --git a/installation/sdnc/src/main/scripts/installSdncDb.sh b/installation/sdnc/src/main/scripts/installSdncDb.sh index 6f42e8f8..6f42e8f8 100755..100644 --- a/installation/sdnc/src/main/scripts/installSdncDb.sh +++ b/installation/sdnc/src/main/scripts/installSdncDb.sh diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index bb50168f..bb50168f 100755..100644 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml index 5397b4ba..d2ff86ad 100644 --- a/installation/ubuntu/pom.xml +++ b/installation/ubuntu/pom.xml @@ -5,27 +5,58 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation-ubuntu</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <name>Installation - ubuntu</name> <description>Creates base ubuntu Docker container</description> <properties> <image.name>openecomp/ubuntu-sdnc-image</image.name> + <sdnc.project.version>${project.version}</sdnc.project.version> </properties> <build> <plugins> + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + 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']; + </source> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> @@ -41,8 +72,9 @@ <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> <tags> - <tag>${project.version}</tag> - <tag>latest</tag> + <tag>${project.version}</tag> + <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> + <tag>${project.docker.latesttag.version}</tag> </tags> </build> </image> |