Merge develop into side branch

Merge request reports

Loading
+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
+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
+13 −1
Changes for ci-templates/default.yml: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -7,11 +7,23 @@ 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 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, 0-9, '_', '.', and '-' are allowed."
          exit 1
        fi

        # Convert to lowercase
        export APP_VERSION=$(echo "$APP_VERSION" | tr 'A-Z' 'a-z')
      fi
    - echo "APP_VERSION set to $APP_VERSION"
+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
}

+3 −1
Changes for kubernetes/helm/openslice/templates/oasapi.yaml: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ spec:
            - name: SPRING_APPLICATION_JSON
              value: >-
                {
                  "origins":"{{ .Values.rooturl }}", 
                  "spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/ostmfdb?createDatabaseIfNotExist=true&useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", 
                  "spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
                  "spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
@@ -55,7 +56,8 @@ spec:
                  "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 
                  "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",  
                  "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", 
                  "logging.level.org.springframework" : "{{ .Values.oasapi.spring.logLevel | default "INFO" }}"
                  "logging.level.org.springframework" : "{{ .Values.oasapi.spring.logLevel | default "INFO" }}",
                  "server.forward-headers-strategy":"FRAMEWORK"
                }
          resources:
            {{- toYaml .Values.resources | nindent 12 }}
Loading
Loading