From 9c02bdd647ef8dea1ab393401e84039d5fb075d6 Mon Sep 17 00:00:00 2001 From: tawoe Date: Mon, 19 May 2025 16:45:40 +0200 Subject: [PATCH 1/4] add opentelemetry to container image --- .github/Dockerfile_PreBuild | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/Dockerfile_PreBuild b/.github/Dockerfile_PreBuild index 7827150243..b849b021b2 100644 --- a/.github/Dockerfile_PreBuild +++ b/.github/Dockerfile_PreBuild @@ -4,6 +4,7 @@ ENV JMX_EXPORTER_VERSION=1.2.0 # To enable add "-javaagent:$JETTY_BASE/jmx-exporter.jar=8090:$JETTY_BASE/prometheus_config.yml" to the JAVA_OPTIONS RUN wget https://github.com/prometheus/jmx_exporter/releases/download/$JMX_EXPORTER_VERSION/jmx_prometheus_javaagent-$JMX_EXPORTER_VERSION.jar -o /var/lib/jetty/jmx-exporter.jar +RUN wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar -o /var/lib/jetty/opentelemetry.jar COPY .github/jmx_exporter.config /var/lib/jetty/prometheus_config.yml # Copy OBP source code # Copy build artifact (.war file) into jetty from 'maven' stage. From 172e137883b2c66c07f26cdd6ffc8074891d5803 Mon Sep 17 00:00:00 2001 From: tawoe Date: Fri, 23 May 2025 09:53:31 +0200 Subject: [PATCH 2/4] fix props default doc --- obp-api/src/main/resources/props/sample.props.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template index c98556d02c..0d135109a1 100644 --- a/obp-api/src/main/resources/props/sample.props.template +++ b/obp-api/src/main/resources/props/sample.props.template @@ -73,7 +73,7 @@ starConnector_supported_types=mapped,internal #endpointMapping.cache.ttl.seconds=0 ## webui props cache time-to-live in seconds -#webui.props.cache.ttl.seconds=20 +#webui.props.cache.ttl.seconds=0 ## DynamicEntity cache time-to-live in seconds, default is 30, the value is 0 at test environment ## no 0 value will cause new dynamic entity will be shown after that seconds From 7996e325e6361328fa7070925b8ef1a88effc6a0 Mon Sep 17 00:00:00 2001 From: tawoe Date: Tue, 6 Jan 2026 11:24:03 +0100 Subject: [PATCH 3/4] build action extract failed tests --- .github/workflows/build_container_develop_branch.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_container_develop_branch.yml b/.github/workflows/build_container_develop_branch.yml index 793a4d81e1..18e7d87ce3 100644 --- a/.github/workflows/build_container_develop_branch.yml +++ b/.github/workflows/build_container_develop_branch.yml @@ -76,7 +76,15 @@ jobs: echo ResetPasswordUrlEnabled=true >> obp-api/src/main/resources/props/test.default.props echo consents.allowed=true >> obp-api/src/main/resources/props/test.default.props - MAVEN_OPTS="-Xmx3G -Xss2m" mvn clean package -Pprod + MAVEN_OPTS="-Xmx3G -Xss2m" mvn clean package -Pprod | tee mvn.log + echo "========== FAILED markers ==========" + grep -n -E "\*\*\* FAILED \*\*\*|=> FAIL|^\[error\].*(FAILED|Error)|AssertionError|Exception in thread|Caused by:" mvn.log || true + + echo "========== ScalaTest FAILED blocks (with context) ==========" + grep -n -B 3 -A 20 "\*\*\* FAILED \*\*\*" mvn.log || true + + echo "========== sbt-style [error] blocks (with context) ==========" + grep -n -B 2 -A 20 "^\[error\]" mvn.log || true - name: Save .war artifact run: | From 1c187b49c23b2a54ccf70b176047f04f47f8c97c Mon Sep 17 00:00:00 2001 From: tawoe Date: Thu, 29 Jan 2026 10:20:59 +0100 Subject: [PATCH 4/4] gh actions code clean --- .github/Dockerfile_PreBuild_OC | 11 ----------- .github/workflows/build_container.yml | 18 +----------------- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 .github/Dockerfile_PreBuild_OC diff --git a/.github/Dockerfile_PreBuild_OC b/.github/Dockerfile_PreBuild_OC deleted file mode 100644 index c8cf7ad5cc..0000000000 --- a/.github/Dockerfile_PreBuild_OC +++ /dev/null @@ -1,11 +0,0 @@ -FROM jetty:9.4-jdk11-alpine -# Copy build artifact (.war file) into jetty from 'maven' stage. -COPY /obp-api/target/obp-api-1.*.war /var/lib/jetty/webapps/ROOT.war -USER root -RUN mkdir -p /WEB-INF/classes -COPY .github/logback.xml /WEB-INF/classes/ -RUN cd / && jar uvf /var/lib/jetty/webapps/ROOT.war WEB-INF/classes/logback.xml -RUN chgrp -R 0 /tmp/jetty && chmod -R g+rwX /tmp/jetty -RUN chgrp -R 0 /var/lib/jetty && chmod -R g+rwX /var/lib/jetty -RUN chgrp -R 0 /usr/local/jetty && chmod -R g+rwX /usr/local/jetty -USER jetty diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index f7fe971f7b..68cbfbb013 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -2,16 +2,9 @@ name: Build and publish container develop # read-write repo token # access to secrets -on: - workflow_dispatch: - push: - branches: - - "*" - - "**" -# - develop +on: [push] env: - ## Sets environment variable DOCKER_HUB_ORGANIZATION: ${{ vars.DOCKER_HUB_ORGANIZATION }} DOCKER_HUB_REPOSITORY: obp-api @@ -19,12 +12,9 @@ jobs: build: runs-on: ubuntu-latest services: - # Label used to access the service container redis: - # Docker Hub image image: redis ports: - # Opens tcp port 6379 on the host and service container - 6379:6379 # Set health checks to wait until redis has started options: >- @@ -132,10 +122,8 @@ jobs: echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io if [ "${{ github.ref }}" == "refs/heads/develop" ]; then docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/} - # docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC else docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/} - # docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC fi docker push docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }} --all-tags echo docker done @@ -153,13 +141,9 @@ jobs: docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/} cosign sign -y --key cosign.key \ docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA - # cosign sign -y --key cosign.key \ - # docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC if [ "${{ github.ref }}" == "refs/heads/develop" ]; then cosign sign -y --key cosign.key \ docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest - # cosign sign -y --key cosign.key \ - # docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC fi env: COSIGN_PASSWORD: "${{secrets.COSIGN_PASSWORD}}"