Remove unneeded Opendaylight directories
Remove OpenDaylight sodium and aluminun directories, no longer
needed in Istanbul
Issue-ID: CCSDK-3363
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: If5bfabd05f8b19f2f2b1cccf6bfba8eec7511bc5
diff --git a/opendaylight/aluminum/aluminum-alpine/pom.xml b/opendaylight/aluminum/aluminum-alpine/pom.xml
deleted file mode 100644
index ba82d8d..0000000
--- a/opendaylight/aluminum/aluminum-alpine/pom.xml
+++ /dev/null
@@ -1,187 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.distribution</groupId>
- <artifactId>distribution-odl-aluminum</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>distribution-odl-aluminum-docker</artifactId>
- <packaging>pom</packaging>
-
- <name>ccsdk-distribution :: opendaylight :: aluminum :: docker</name>
- <description>Creates OpenDaylight container</description>
- <organization>
- <name>ONAP</name>
- </organization>
-
- <properties>
- <image.name>onap/ccsdk-odl-aluminum-alpine-image</image.name>
- <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
- <odl.shiro.version>0.12.1</odl.shiro.version>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>${basedir}/../../../src/main/scripts/TagVersion.groovy</source>
- </configuration>
- </execution>
- </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>${odl.karaf.artifactId}</artifactId>
- <version>${ccsdk.opendaylight.version}</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>
- <execution>
- <id>copy-with-alternalte-repo-2</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.highstreet-technologies.aaa</groupId>
- <artifactId>aaa-shiro</artifactId>
- <version>${odl.shiro.version}</version>
- <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version}</outputDirectory>
- <destFileName>aaa-shiro-${odl.shiro.version}.jar</destFileName>
- <excludes>*</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>com.highstreet-technologies.aaa</groupId>
- <artifactId>aaa-authn-api</artifactId>
- <version>${odl.shiro.version}</version>
- <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory>
- <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
- <excludes>*</excludes>
- </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>
- <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>
- <resource>
- <directory>src/main/odlscripts</directory>
- <includes>
- <include>*</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.34.0</version>
- <inherited>false</inherited>
- <configuration>
- <images>
- <image>
- <name>${image.name}</name>
- <build>
- <cleanup>try</cleanup>
- <noCache>true</noCache>
- <contextDir>${basedir}/target/docker-stage</contextDir>
- <dockerFile>Dockerfile</dockerFile>
- <tags>
- <tag>${project.docker.latestminortag.version}</tag>
- <tag>${project.docker.latestfulltag.version}</tag>
- <tag>${project.docker.latesttagtimestamp.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- <verbose>${docker.verbose}</verbose>
- <skipPush>${docker.skip.push}</skipPush>
- </configuration>
- <executions>
- <execution>
- <id>build-push-images</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
deleted file mode 100644
index 978a091..0000000
--- a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Prepare stage for multistage image build
-## START OF STAGE0 ##
-FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} AS stage0
-USER root
-
-ENV ODL_HOME /opt/opendaylight/current
-
-# copy the opendaylight tar and expand
-COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
-RUN mkdir -p /opt/odl \
- && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
- && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \
- && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \
- && ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
- && ln -s /opt/opendaylight /opt/opendaylight/current
-
-# Enable wheel and create a group and user
-RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \
- && addgroup -S odl \
- && adduser -S odl -G odl \
- && addgroup odl wheel
-
-# Patch some opendaylight artifacts
-COPY system $ODL_HOME/system
-
-# Add missing scripts see SDNC-1056
-#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/
-#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt
-
-# Changing ownership and permission of /opt
-RUN chown -R odl:odl /opt && chmod -R 755 /opt
-
-## END OF STAGE0 ##
-
-#################################################
-
-## This will create actual image
-FROM scratch
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
-USER root
-
-ENV JAVA_HOME=/opt/java/openjdk \
- PATH=$PATH:/opt/java/openjdk/bin \
- ODL_HOME=/opt/opendaylight/current
-
-# Copy Everything from stage0
-COPY --from=stage0 / /
-
-USER odl
-EXPOSE 8181
-WORKDIR $ODL_HOME
-# ENTRYPOINT exec /opt/opendaylight/bin/karaf
diff --git a/opendaylight/aluminum/pom.xml b/opendaylight/aluminum/pom.xml
deleted file mode 100644
index e4155bd..0000000
--- a/opendaylight/aluminum/pom.xml
+++ /dev/null
@@ -1,35 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.distribution</groupId>
- <artifactId>distribution-opendaylight</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>distribution-odl-aluminum</artifactId>
- <packaging>pom</packaging>
-
- <name>ccsdk-distribution :: opendaylight :: aluminum</name>
- <description>Creates OpenDaylight container</description>
-
- <modules>
- <module>aluminum-alpine</module>
- </modules>
-
- <properties>
- <ccsdk.opendaylight.version>0.13.1</ccsdk.opendaylight.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.integration</groupId>
- <artifactId>onap-karaf</artifactId>
- <version>${ccsdk.opendaylight.version}</version>
- <type>tar.gz</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
diff --git a/opendaylight/sodium/pom.xml b/opendaylight/sodium/pom.xml
deleted file mode 100644
index fe63f6d..0000000
--- a/opendaylight/sodium/pom.xml
+++ /dev/null
@@ -1,35 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.distribution</groupId>
- <artifactId>distribution-opendaylight</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>distribution-odl-sodium</artifactId>
- <packaging>pom</packaging>
-
- <name>ccsdk-distribution :: opendaylight :: sodium</name>
- <description>Creates OpenDaylight container</description>
-
- <modules>
- <module>sodium-alpine</module>
- </modules>
-
- <properties>
- <ccsdk.opendaylight.version>0.11.4</ccsdk.opendaylight.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.integration</groupId>
- <artifactId>onap-karaf</artifactId>
- <version>${ccsdk.opendaylight.version}</version>
- <type>tar.gz</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
diff --git a/opendaylight/sodium/sodium-alpine/pom.xml b/opendaylight/sodium/sodium-alpine/pom.xml
deleted file mode 100644
index 885262e..0000000
--- a/opendaylight/sodium/sodium-alpine/pom.xml
+++ /dev/null
@@ -1,156 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.distribution</groupId>
- <artifactId>distribution-odl-sodium</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>distribution-odl-sodium-docker</artifactId>
- <packaging>pom</packaging>
-
- <name>ccsdk-distribution :: opendaylight :: sodium :: docker</name>
- <description>Creates OpenDaylight container</description>
- <organization>
- <name>ONAP</name>
- </organization>
-
- <properties>
- <image.name>onap/ccsdk-odl-sodium-alpine-image</image.name>
- <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>${basedir}/../../../src/main/scripts/TagVersion.groovy</source>
- </configuration>
- </execution>
- </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>${odl.karaf.artifactId}</artifactId>
- <version>${ccsdk.opendaylight.version}</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>
- <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>
- <resource>
- <directory>src/main/odlscripts</directory>
- <includes>
- <include>*</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.34.0</version>
- <inherited>false</inherited>
- <configuration>
- <images>
- <image>
- <name>${image.name}</name>
- <build>
- <cleanup>try</cleanup>
- <noCache>true</noCache>
- <contextDir>${basedir}/target/docker-stage</contextDir>
- <dockerFile>Dockerfile</dockerFile>
- <tags>
- <tag>${project.docker.latestminortag.version}</tag>
- <tag>${project.docker.latestfulltag.version}</tag>
- <tag>${project.docker.latesttagtimestamp.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- <verbose>${docker.verbose}</verbose>
- <skipPush>${docker.skip.push}</skipPush>
- </configuration>
- <executions>
- <execution>
- <id>build-push-images</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile
deleted file mode 100644
index 11eeacd..0000000
--- a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
-
-ENV ODL_HOME /opt/opendaylight/current
-
-# copy the opendaylight tar and expand
-USER root
-COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
-RUN mkdir -p /opt/odl \
- && tar zxvf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
- && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \
- && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \
- && ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
- && ln -s /opt/opendaylight /opt/opendaylight/current
-
-# Add missing scripts see SDNC-1056
-#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/
-#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt
-
-# ENTRYPOINT exec /opt/opendaylight/bin/karaf
-USER onap
-EXPOSE 8181