Commit 8f7ef499 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

Merge branch 'main' into java-25

parents f9f8e244 ee831b72

.gitlab-ci.yml

+8 −6
Changes for .gitlab-ci.yml: 8 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ dev_tests_job: 
  stage: dev_test

  tags:

    - hypo

  image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17-slim

  image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.9.16-eclipse-temurin-17



  before_script:

    - curl -fsSL https://get.docker.com -o get-docker.sh
@@ -199,7 +199,7 @@ dev_deploy_job: 


  script:

    - sops --decrypt charts/hypo/values-cd.enc.yaml > charts/hypo/values-cd.yaml

    - python3 scripts/helm_update_etsi.py $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $DEV_TMF_API_IMAGE $DEV_SONATA_CORE_IMAGE $DEV_SONATA_HELM_IMAGE $DEV_SONATA_OSS_IMAGE $DEV_TELEMETRY_IMAGE $DEV_PEERING_IMAGE $DEV_REGISTRY_IMAGE $DEV_FABRIC_IMAGE $DEV_PORTAL

    - python3 scripts/helm_update_etsi.py $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $DEV_TMF_API_IMAGE $DEV_SONATA_CORE_IMAGE $DEV_SONATA_HELM_IMAGE $DEV_SONATA_OSS_IMAGE $DEV_TELEMETRY_IMAGE $DEV_PEERING_IMAGE $DEV_REGISTRY_IMAGE $DEV_FABRIC_IMAGE $DEV_PORTAL $DEV_SERVICE_MONITOR_IMAGE

    - sops --encrypt --age $SOPS_AGE_KEY_PUBLIC charts/hypo/values-cd.yaml > charts/hypo/values-cd.enc.yaml

    - rm -f charts/hypo/values-cd.yaml ~/.sops-age-key.txt

    - git add charts/hypo/values-cd.enc.yaml
@@ -288,7 +288,7 @@ prod_extract_next_release_job: 
  variables:

    GITLAB_TOKEN: $GROUP_ACCESS_TOKEN

  script:

    - DEV_RELEASE_VERSION=$(npx -y

    - npx -y

      -p @semantic-release/commit-analyzer@9.0.2

      -p @semantic-release/git@10.0.1

      -p @semantic-release/gitlab@9.5.0
@@ -297,7 +297,8 @@ prod_extract_next_release_job: 
      -p @semantic-release/changelog@6.0.2

      -p conventional-changelog-conventionalcommits@5.0.0

      -p semantic-release@19.0.5

      semantic-release --dry-run | grep -oP '(?<=Published release ).*' | awk '{print $1}' || echo "no-release" )

      semantic-release --dry-run

    - DEV_RELEASE_VERSION=$(cat .next-release-version 2>/dev/null || echo "no-release")

    - echo "$DEV_RELEASE_VERSION" > dev_release_version.txt

    - cat dev_release_version.txt

  artifacts:
@@ -354,7 +355,7 @@ prod_semantic_versioning_job: 
  before_script:

    - git pull origin HEAD

  script:

    - RELEASE_VERSION=$(npx -y

    - npx -y

      -p @semantic-release/commit-analyzer@9.0.2

      -p @semantic-release/git@10.0.1

      -p @semantic-release/gitlab@9.5.0
@@ -363,7 +364,8 @@ prod_semantic_versioning_job: 
      -p @semantic-release/changelog@6.0.2

      -p conventional-changelog-conventionalcommits@5.0.0

      -p semantic-release@19.0.5

      semantic-release | grep -oP '(?<=Published release ).*' | awk '{print $1}' || echo "no-release" )

      semantic-release

    - RELEASE_VERSION=$(cat .next-release-version 2>/dev/null || echo "no-release")

    - echo "$RELEASE_VERSION" > release_version.txt

    - cat release_version.txt

  artifacts:

.releaserc.json

+3 −0
Changes for .releaserc.json: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
    ["@semantic-release/changelog",{

        "changelogFile": "./CHANGELOG.md"

    }],

    ["@semantic-release/exec", {

        "verifyReleaseCmd": "echo ${nextRelease.version} > .next-release-version"

    }],

    "@semantic-release/git"

  ]

}

CHANGELOG.md

+23 −0
Changes for CHANGELOG.md: 23 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# [1.1.0](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/compare/v1.0.1...v1.1.0) (2026-09-29)





### Bug Fixes



* Edit .gitlab-ci.yml ([207c82b](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/207c82b8c964cf52b901054b88220c9192cbb34c))

* Edit .gitlab-ci.yml ([6f9a5ed](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/6f9a5edc5e468c048f4b179eb37ba411f832a040))

* Edit .gitlab-ci.yml ([5542755](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/5542755b4cd2d3e00b0c520dfe85ebd56f3a3f19))

* Edit .gitlab-ci.yml ([da3b048](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/da3b048da3ce6dbc8291d187a1d5c914e017324a))

* Edit .gitlab-ci.yml ([1040b79](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/1040b792da42febab6dd23bd4e829d71f64c3d65))

* Edit .gitlab-ci.yml ([25b3848](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/25b3848f0bc9730e55d422fd279e55d93e942130))

* Edit .releaserc.json for verify cmd ([4242f4a](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/4242f4aa67d555690bef86224437d2581ca38b5a))

* new dev_tests image [skip ci] ([4ab99aa](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/4ab99aa598ecc96ddd40cdf7b3f4544a4dc02d62))

* release pipeline ([d027f7c](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/d027f7cf8b25f40e6c1ec024f7e78e84c2bed61a))

* remove local docker images ([daac907](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/daac9072a78585832cdb3facc51d04e233bc41c2))

* semantic release skipping on error [skip ci] ([a802d4a](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/a802d4a633c252675e24e7caaa6518e44604f7f4))





### Features



* add svc monitor to pipeline ([f5455f7](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/f5455f74e57328b73802b1b92bd16989642e3125))

* quarkus upgrade ([f382807](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/commit/f38280732be4a6ee4273cbd08f43e000b650438b))



## [1.0.1](https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/cart/compare/v1.0.0...v1.0.1) (2026-07-02)

README.md

+1 −1
Changes for README.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
README file added
 
README file added - pipeline

pom.xml

+1 −1
Changes for pom.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    <modelVersion>4.0.0</modelVersion>

    <groupId>org.etsi.osl.hypo.portal</groupId>

    <artifactId>cart</artifactId>

    <version>1.0.1</version>

    <version>1.1.0</version>



    <parent>

        <groupId>org.etsi.osl.hypo.api</groupId>