diff options
author | Timoney, Dan (dt5972) <dtimoney@att.com> | 2018-11-06 14:15:05 -0500 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2018-11-06 14:16:18 -0500 |
commit | d9642fafddbaa28789339e1989c4583af003a193 (patch) | |
tree | 0442af1ba4e793433fac5871dd8e69c98a056446 /installation | |
parent | 33d814f236d4c3e4246851c810bdbbab5090abbb (diff) |
Fix license issues
Fix license definition in package.json files
Remove obsolete dgbuilder from SDNC (dgbuilder now in CCSDK)
Change-Id: Iee0bf9468f081c5957eae2e873efbea6fb6be354
Issue-ID: SDNC-489
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: 4e104ac4183dd46124753c4571939e765a124508
Diffstat (limited to 'installation')
-rwxr-xr-x | installation/dgbuilder/.gitignore | 1 | ||||
-rw-r--r-- | installation/dgbuilder/flowShareUsers.js | 8 | ||||
-rw-r--r-- | installation/dgbuilder/pom.xml | 226 | ||||
-rw-r--r-- | installation/dgbuilder/src/main/docker/Dockerfile | 13 |
4 files changed, 0 insertions, 248 deletions
diff --git a/installation/dgbuilder/.gitignore b/installation/dgbuilder/.gitignore deleted file mode 100755 index ed7fb70f..00000000 --- a/installation/dgbuilder/.gitignore +++ /dev/null @@ -1 +0,0 @@ -releases
\ No newline at end of file diff --git a/installation/dgbuilder/flowShareUsers.js b/installation/dgbuilder/flowShareUsers.js deleted file mode 100644 index 4cbf7390..00000000 --- a/installation/dgbuilder/flowShareUsers.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = {"flowShareUsers": - [ - { - "name" : "Release 1702", - "rootDir" : "1702" - } - ] -} diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml deleted file mode 100644 index 6ddd1eb8..00000000 --- a/installation/dgbuilder/pom.xml +++ /dev/null @@ -1,226 +0,0 @@ -<?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.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation-dgbuilder</artifactId> - <version>1.3.2-SNAPSHOT</version> - - <name>sdnc-oam :: installation :: ${project.artifactId}</name> - <description>Creates docker container for dgbuilder</description> - - <properties> - <image.name>onap/dgbuilder-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] + "-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']; - </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>package</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> - </executions> - </plugin> - - <plugin> - <artifactId>exec-maven-plugin</artifactId> - <groupId>org.codehaus.mojo</groupId> - <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/onap/sdnc</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>Unzip dgbuilder</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/onap/sdnc</argument> - <argument>../../dgbuilder/target/*.zip</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>Copy dgbuilder</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/cp</executable> - <arguments> - <argument>-r</argument> - <argument>../../dgbuilder</argument> - <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> - </arguments> - </configuration> - </execution> - - <execution> - <id>dgbuilder createReleaseDir</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/bash</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/sdnc/dgbuilder/createReleaseDir.sh</argument> - <argument>1702</argument> - <argument>dguser</argument> - <argument>change_email_id@dgbuilder.com</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/onap/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/src/main/docker/Dockerfile b/installation/dgbuilder/src/main/docker/Dockerfile deleted file mode 100644 index 2160e3e9..00000000 --- a/installation/dgbuilder/src/main/docker/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -# Base ubuntu with added packages needed for open ecomp -FROM onap/ubuntu-sdnc-image:${project.version} -MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) - -# copy openecomp -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 - -#ENTRYPOINT /bin/bash /opt/openecomp/sdnc/dgbuilder/start sdnc1.0 -EXPOSE 3100 |