Commit 18aa19bb authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

fixing ci.yml

parent 171c9bdb

.gitlab-ci.yml

+29 −10
Original line number Diff line number Diff line 
include:

  - project: osl/code/org.etsi.osl.main

    ref: main

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml



  - local: ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED'

      - if: '$CI_COMMIT_REF_NAME == "main"'

  

  - local: ci-templates/build_unprotected.yml

  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'

  

      - if: '$CI_COMMIT_REF_NAME == "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: $CI_COMMIT_REF_NAME

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build_unprotected.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'



maven_build:

  extends: .maven_build
@@ -20,3 +38,4 @@ docker_build: 
  extends: .docker_build

  needs:

    - maven_build

ci-templates/build.yml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
.maven_build:

  extends: .default

  stage: build

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

  script:

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

  artifacts:

    paths:

      - target/



.docker_build:

  extends: .default

  stage: build

  image:

    name: gcr.io/kaniko-project/executor:debug

    entrypoint: [""]

  script:

    - export DOCKER_TAG=$APP_VERSION

    - |

      if [ "$CI_COMMIT_REF_NAME" = "main" ]; then

        echo "Pushing Docker image with tag 'latest'"

        export DOCKER_TAG=latest

      fi

    - /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${CI_REGISTRY_IMAGE}:$DOCKER_TAG"

ci-templates/default.yml

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
stages:

  - .pre

  - build

  - test

  - post

  - security



.default:

  before_script:

    - |

      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

      fi

src/main/resources/application.yml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ spring: 
    multipart.max-file-size: 10MB

    multipart.max-request-size: 10MB

  activemq:

    brokerUrl: tcp://portal.openslice.eu:61616?jms.watchTopicAdvisories=false

    brokerUrl: tcp://osl.etsi.org:61616?jms.watchTopicAdvisories=false

    user: artemis

    password: artemis

    pool: