summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2021-06-21 15:11:13 -0400
committerKAPIL SINGAL <ks220y@att.com>2021-06-21 19:11:56 +0000
commit69d0b4409347beed1c28818f20e148d37e825453 (patch)
tree0a252de093a48314081af703db635b6b94f154e9
parenteb5b12c7ce09506af6923c1c7bb58dc060514a37 (diff)
Reverting use of ${JAVA_HOME} in PATH
Remving start-it-container as that being done by CSIT Issue-ID: CCSDK-3226 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I8a9a434dad484fa044dfc221cd20d126e06142b2
-rw-r--r--odlsli/odlsli-alpine/pom.xml88
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile2
-rw-r--r--opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile2
-rw-r--r--pom.xml1
4 files changed, 3 insertions, 90 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index aa96b8a8..08ed8f16 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -600,99 +600,13 @@
</image>
</images>
<verbose>${docker.verbose}</verbose>
- <skipRun>${docker.skip.run}</skipRun>
<skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
- <id>build-images</id>
- <phase>package</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>start-it-instance</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- <configuration>
- <images>
- <image>
- <name>mariadb:10.5</name>
- <alias>odlsli-db</alias>
- <run>
- <env>
- <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
- <!-- Below are not required as installSdncDb.sh handles same -->
- <!--
- <MYSQL_USER>sdnctl</MYSQL_USER>
- <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
- <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
- -->
- </env>
- <network>
- <mode>custom</mode>
- <name>onap</name>
- <alias>dbhost</alias>
- <alias>sdnctldb01</alias>
- <alias>sdnctldb02</alias>
- </network>
- <ports>
- <port>odlslidb.port:3306</port>
- </ports>
- <log>
- <enabled>true</enabled>
- </log>
- </run>
- </image>
- <image>
- <name>${image.name}:${project.docker.latesttagtimestamp.snapshot.version}</name>
- <alias>odlsli-container</alias>
- <run>
- <env>
- <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
- <SDNC_DB_USER>sdnctl</SDNC_DB_USER>
- <SDNC_DB_PASSWORD>gamma</SDNC_DB_PASSWORD>
- <SDNC_DB_DATABASE>sdnctl</SDNC_DB_DATABASE>
- <SDNC_CONFIG_DIR>/opt/onap/ccsdk/data/properties</SDNC_CONFIG_DIR>
- <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
- </env>
- <dependsOn>
- <container>odlsli-db</container>
- </dependsOn>
- <network>
- <mode>custom</mode>
- <name>onap</name>
- <alias>odlsli</alias>
- </network>
- <ports>
- <port>odlsli.port:8181</port>
- </ports>
- <wait>
- <log>all warp coils are now operating at peak efficiency</log>
- <time>300000</time>
- </wait>
- <log>
- <enabled>true</enabled>
- </log>
- </run>
- </image>
- </images>
- </configuration>
- </execution>
- <execution>
- <id>stop-it-instance</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- <execution>
- <id>push-images</id>
- <goals>
- <!--<goal>build</goal>-->
<goal>push</goal>
</goals>
</execution>
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index be93e531..3b57252e 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -56,7 +56,7 @@ LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)"
USER root
ENV JAVA_HOME /opt/java/openjdk
-ENV PATH ${JAVA_HOME}/bin:$PATH
+ENV PATH $PATH:/opt/java/openjdk/bin
ENV ODL_HOME /opt/opendaylight/current
ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
index 6e1023ee..7a7bf403 100644
--- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
@@ -30,7 +30,7 @@ MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
USER root
ENV JAVA_HOME /opt/java/openjdk
-ENV PATH $JAVA_HOME/bin:$PATH
+ENV PATH $PATH:/opt/java/openjdk/bin
ENV ODL_HOME /opt/opendaylight/current
# Copy Everything from stage0
diff --git a/pom.xml b/pom.xml
index 6043cbc5..87beeb4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,6 @@
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<build.number>${maven.build.timestamp}</build.number>
- <docker.skip.run>false</docker.skip.run>
<docker.skip.push>false</docker.skip.push>
<docker.verbose>true</docker.verbose>