Skip to content

FDP-3056: Added smhe containers #1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 65 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
a1b7ce8
FDP-3056: Added smhe containers
JelleHoffman Mar 24, 2025
2025191
Added smhe containers to build.yml
paulusalliander Apr 17, 2025
1b4f6e9
Added newlines.
paulusalliander Apr 17, 2025
465d75e
Removed slash from throttling service.
paulusalliander Apr 17, 2025
c19d4ec
Added checkout to branch for testing.
paulusalliander Apr 22, 2025
d41386d
Added Readme with test instructions.
paulusalliander Apr 22, 2025
6fe12e5
Corrected README for triggering build.yml.
paulusalliander Apr 22, 2025
4a6e971
Small change in README.md.
paulusalliander Apr 22, 2025
8dfe453
Disabled pr tag.
paulusalliander Apr 22, 2025
fd1f84f
Re-enabled pr event.
Apr 23, 2025
b44c433
Removed slashes for images.
Apr 23, 2025
26e7df2
Removed final backslash to prevent docker warning
paulusalliander Apr 24, 2025
a8936e1
Merge branch 'feature/FDP-3056-smhe-cucumber-containers' of github.co…
paulusalliander Apr 24, 2025
7364ff6
Added secret management to find command.
Apr 30, 2025
5859263
Merge branch 'feature/FDP-3056-smhe-cucumber-containers' of github.co…
Apr 30, 2025
763bf0c
Added device simulator start to find command.
Apr 30, 2025
a56942f
Merge branch 'development' into feature/FDP-3056-smhe-cucumber-contai…
Apr 30, 2025
5849ffa
Added ci/smartmetering-values.yaml
Apr 30, 2025
355386f
Tryout failed kubectl.
Apr 30, 2025
439eb86
Added exit 1 on failure.
Apr 30, 2025
19a4520
Added debug logs on timeout.
Apr 30, 2025
2465963
Namespace is not needed.
Apr 30, 2025
ee53f1c
Added semicolons.
Apr 30, 2025
0f72e80
Removed ns variables.
Apr 30, 2025
c19b18f
Show only running containers logs on error.
paulusalliander May 1, 2025
48f32ec
Back to 30min
paulusalliander May 1, 2025
63ec08f
Added list events.
paulusalliander May 1, 2025
9ae6856
Add authentication to ghcr.
May 5, 2025
3a7cf13
Merge branch 'feature/FDP-3056-smhe-cucumber-containers' of github.co…
May 5, 2025
d6e35a0
Removed incorrect paths for images.
May 5, 2025
7430542
Better logging.
May 5, 2025
70b170a
Better logging 2.
May 5, 2025
50ce8be
Better logging 3.
May 5, 2025
accd178
Better logging 4.
May 5, 2025
7db3595
Better logging 5.
May 5, 2025
485ad5b
Removed upload artifact.
May 6, 2025
bb722a7
Changed localhost to postgres.
paulusalliander May 6, 2025
6c26e60
Merge branch 'feature/FDP-3056-smhe-cucumber-containers' of github.co…
paulusalliander May 6, 2025
5c231c1
Added constant for postgres host string.
paulusalliander May 6, 2025
c6fce72
Fixed formatting for cucumber integration test.
paulusalliander May 6, 2025
0371480
Revert "Fixed formatting for cucumber integration test."
May 6, 2025
c882a21
Add db options for postgres kubernetes.
May 6, 2025
e7dbb05
Revert "Added constant for postgres host string."
May 6, 2025
7e1327b
Revert "Changed localhost to postgres."
May 6, 2025
a1abe1e
Revert "Add db options for postgres kubernetes."
paulusalliander May 6, 2025
13ad4ab
Update osgp-throttling-service.properties
paulusalliander May 6, 2025
c6a48f6
Added redis host.
paulusalliander May 7, 2025
b24be68
Merge branch 'feature/FDP-3056-smhe-cucumber-containers' of github.co…
paulusalliander May 7, 2025
ff7e061
Upload kubernetes log artifacts on error.
paulusalliander May 8, 2025
e994e50
Don't run on single line.
paulusalliander May 8, 2025
4aac343
Added continue on error for cucumber_job.
paulusalliander May 8, 2025
0b40a44
Try to fix cucumber job output.
paulusalliander May 12, 2025
4bb96cf
Fixed incorrect syntax
May 12, 2025
e7b3fa5
Moved status error assignment to top.
May 12, 2025
05fb2cc
Re-added timeout 30m
May 12, 2025
7a04223
Write both stderr and stdout to log files.
paulusalliander May 13, 2025
4b32d73
Removed comma's, reduced timeout.
May 14, 2025
4b797df
Removed pod logs for testing.
May 14, 2025
32e949d
Added lognames for values_files
May 14, 2025
e0df097
Removed -values from logname
May 14, 2025
031e08f
Stop failing fast so we can collect logs.
May 14, 2025
5863daa
Readded logs for pods.
May 14, 2025
12ccfaa
Added ls.
May 14, 2025
242d225
Removed slash from pod filename.
May 14, 2025
dcebb5c
timeout back to 30m
May 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions osgp/platform/osgp-secret-management/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM tomcat:10.1-jre17-temurin-noble

RUN rm -rf /usr/local/tomcat/webapps.dist

# Enable the use of system environment variables in Tomcat configuration files.
RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /usr/local/tomcat/conf/catalina.properties

RUN mkdir -p /var/log/osp && \
rm -rf /usr/local/tomcat/webapps/* && \
chmod 755 /usr/local/tomcat/webapps /var/log/osp && \
mkdir -p /usr/local/tomcat/webapps/probe/ && \
touch /usr/local/tomcat/webapps/probe/probe.txt \

WORKDIR /opt/app
COPY target/osgp-secret-management-*exec.jar osgp-secret-management-exec.jar

ENV SERVER_PORT=8443

CMD java -Djava.security.properties=/opt/app/java.security --module-path /opt/nfast/java/classes -jar osgp-secret-management-exec.jar
14 changes: 14 additions & 0 deletions osgp/platform/osgp-throttling-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM tomcat:10.1-jre17-temurin-noble

RUN rm -rf /usr/local/tomcat/webapps.dist

# Enable the use of system environment variables in Tomcat configuration files.
RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /usr/local/tomcat/conf/catalina.properties

RUN mkdir -p /var/log/osp && \
rm -rf /usr/local/tomcat/webapps/* && \
chmod 755 /usr/local/tomcat/webapps /var/log/osp && \
mkdir -p /usr/local/tomcat/webapps/probe/ && \
touch /usr/local/tomcat/webapps/probe/probe.txt \

COPY target/gxf /usr/local/tomcat/webapps/
1 change: 1 addition & 0 deletions osgp/platform/osgp-throttling-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ SPDX-License-Identifier: Apache-2.0
<artifactId>maven-war-plugin</artifactId>
<version>${maven.war.plugin.version}</version>
<configuration>
<webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
<attachClasses>true</attachClasses>
</configuration>
</plugin>
Expand Down
17 changes: 17 additions & 0 deletions osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM tomcat:10.1-jre17-temurin-noble

RUN rm -rf /usr/local/tomcat/webapps.dist

# Enable the use of system environment variables in Tomcat configuration files.
RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /usr/local/tomcat/conf/catalina.properties

RUN mkdir -p /var/log/osp && \
rm -rf /usr/local/tomcat/webapps/* && \
chmod 755 /usr/local/tomcat/webapps /var/log/osp && \
mkdir -p /usr/local/tomcat/webapps/probe/ && \
touch /usr/local/tomcat/webapps/probe/probe.txt \


RUN apt-get update && apt-get install iputils-ping -y && rm -rf /var/lib/apt/lists/*

COPY target/gxf /usr/local/tomcat/webapps/
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ SPDX-License-Identifier: Apache-2.0
<artifactId>maven-war-plugin</artifactId>
<version>${maven.war.plugin.version}</version>
<configuration>
<webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
<attachClasses>true</attachClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
<nonFilteredFileExtensions>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM tomcat:10.1-jre17-temurin-noble

RUN rm -rf /usr/local/tomcat/webapps.dist

# Enable the use of system environment variables in Tomcat configuration files.
RUN echo "org.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" >> /usr/local/tomcat/conf/catalina.properties

RUN mkdir -p /var/log/osp && \
rm -rf /usr/local/tomcat/webapps/* && \
chmod 755 /usr/local/tomcat/webapps /var/log/osp && \
mkdir -p /usr/local/tomcat/webapps/probe/ && \
touch /usr/local/tomcat/webapps/probe/probe.txt \

COPY context.xml /usr/local/tomcat/conf
COPY target/gxf /usr/local/tomcat/webapps/
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You 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.
-->
<!-- The contents of this file will be loaded for each web application -->
<Context useHttpOnly="true">

<!-- Default set of monitored resources -->
<WatchedResource>WEB-INF/web.xml</WatchedResource>

<!-- Uncomment this to disable session persistence across Tomcat restarts -->
<!-- <Manager pathname="" /> -->

<!-- Uncomment this to enable Comet connection tacking (provides events
on session expiration as well as webapp lifecycle) -->
<!-- <Valve className="org.apache.catalina.valves.CometConnectionManagerValve"
/> -->

<!-- App config files -->
<!-- Global.properties -->
<Environment name="osgp/Global/config" value="/etc/osgp/global.properties"
type="java.lang.String" override="true" />

<Environment name="osgp/SimulatorDlmsTriggered/log-config"
value="/etc/osgp/osgp-simulator-dlms-triggered-logback.xml" type="java.lang.String"
override="true" />

</Context>
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ SPDX-License-Identifier: Apache-2.0
<artifactId>maven-war-plugin</artifactId>
<version>${maven.war.plugin.version}</version>
<configuration>
<webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
<attachClasses>true</attachClasses>
<failOnMissingWebXml>false</failOnMissingWebXml>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>gif</nonFilteredFileExtension>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM amazoncorretto:17-alpine-jdk

RUN apk add --update coreutils tzdata && rm -rf /var/cache/apk/*

COPY target/dlms-device-simulator-starter*.jar /app/dlms-device-simulator-starter.jar

ENTRYPOINT ["java", "-jar", "/app/dlms-device-simulator-starter.jar", "/config/simulators.json", "start"]
Loading