MR for Release 2024Q4

Kostis Trantzasrequested to merge
develop into main

Merge request reports

ci-templates/build.yml

+2 −2
Changes for ci-templates/build.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
.maven_build:

  extends: .default

  stage: build

  image: maven:3.9.5-ibm-semeru-17-focal

  image: maven:3.9.9-ibm-semeru-17-focal

  script:

    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION

  artifacts:
@@ -26,7 +26,7 @@ 
.angular_build:

  extends: .default

  stage: build

  image: trion/ng-cli:14.2.6

  image: trion/ng-cli:13.3.7

  script:

    - |

      if [ ! -f  "./src/assets/config/theming.scss" ]; then

ci-templates/build_unprotected.yml

+2 −2
Changes for ci-templates/build_unprotected.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
.maven_build:

  extends: .default

  stage: build

  image: maven:3.9.5-ibm-semeru-17-focal

  image: maven:3.9.9-ibm-semeru-17-focal

  script:

    - mvn install -s ci_settings.xml

  artifacts:
@@ -20,7 +20,7 @@ 
.angular_build:

  extends: .default

  stage: build

  image: trion/ng-cli:14.2.6

  image: trion/ng-cli:13.3.7

  script:

    - |

      if [ ! -f  "./src/assets/config/theming.scss" ]; then

ci-templates/default.yml

+12 −1
Changes for ci-templates/default.yml: 12 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -7,11 +7,22 @@ stages: 


.default:

  before_script:

    - set -e

    - |

      if [ "$CI_COMMIT_REF_PROTECTED" = true ] && [ -n "$CI_COMMIT_TAG" ]; then

        export APP_VERSION=$CI_COMMIT_TAG

      elif [ "$CI_COMMIT_REF_NAME" = "develop" ]; then

        export APP_VERSION="develop"

      else

        export APP_VERSION=$CI_COMMIT_REF_NAME

        # Replace '/' with '-' and check for any invalid characters

        APP_VERSION=$(echo "$CI_COMMIT_REF_NAME" | sed 's|/|-|g')

        

        # Check for invalid characters (only allow lowercase and uppercase letters, digits, '_', '.', '-')

        if echo "$APP_VERSION" | grep -q '[^a-zA-Z0-9._-]'; then

          echo "Error: Branch name contains invalid characters for Docker tags. Only a-z, A-Z, 0-9, '_', '.', and '-' are allowed."

          exit 1

        fi



        export APP_VERSION

      fi

    - echo "APP_VERSION set to $APP_VERSION"

compose/deploy.sh

+1 −1
Changes for compose/deploy.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ updaterepo(){ 


        # Build maven project if .pom file is present

        if [ -f  "./pom.xml" ]; then

            docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven maven:3.9.5-ibm-semeru-17-focal mvn clean verify -DskipTests

            docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven maven:3.9.9-ibm-semeru-17-focal mvn clean verify -DskipTests

        fi

}

compose/docker-compose.yaml.configure

+32 −1
Changes for compose/docker-compose.yaml.configure: 32 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ services: 


  artemis:

    container_name: anartemis

    image: apache/activemq-artemis:2.30.0

    image: apache/activemq-artemis:2.31.1

    restart: always

    profiles: ["dev", "prod"]

    ports:
@@ -207,6 +207,7 @@ services: 
        "spring.activemq.password": "artemis",

        "logging.level.org.springframework" : "INFO",

        "logging.level.org.etsi.osl.tmf.api" : "INFO",

        "logging.level.org.etsi.osl.tmf.*" : "INFO",

        "kroki.serverurl" : "http://localhost/kroki",

        "server.forward-headers-strategy":"FRAMEWORK"

        }'
@@ -323,6 +324,36 @@ services: 
    depends_on:

    - osscapi



  metrico:

    container_name: openslice-metrico

    restart: always

    profiles: [ "prod"]

    build:

        context:  ../../org.etsi.osl.metrico/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",

        "spring.datasource.username":"root",

        "spring.datasource.password":"letmein",

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",

        "spring.activemq.user": "artemis",

        "spring.activemq.password": "artemis",

        "logging.level.org.springframework" : "DEBUG",

        "logging.level.org.etsi.osl.metrico" : "DEBUG"

        }'

    logging:

      driver: "json-file"

      options:

        max-size: "800m"

        max-file: "3"        

    networks:

    - front

    - back

    depends_on:

    - osscapi

    - mysql-portal



    

  portainer: