Commit e2256490 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/gitlab-ci-templates!50
parents 1025fc2b acd20994

_packaging.yml

+6 −4
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ lint-dockerfile: 
  script:

    - docker run --rm -i ${LINT_IMAGE_NAME}:${LINT_IMAGE_TAG} < ${DOCKERFILE_PATH}

  allow_failure: true

  only:

    - branches

  except:

    - schedules

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH



container_scanning:

  stage: post-package

deployment-functional-unit.yml

+15 −11
Original line number Diff line number Diff line
@@ -12,11 +12,13 @@ include: 
    DD_IMAGE_TAG: ${CI_COMMIT_TAG}



.deploy-support-branch: &deploy-support-branch

  only:

    - branches

  except:

    - master

    - schedules

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH



deploy-commands-support-branch-development:

  extends: .deploy-commands-development
@@ -31,10 +33,12 @@ deploy-view-support-branch-development: 
  <<: *deploy-support-branch



.deploy-stable-branch: &deploy-stable-branch

  only:

    - master

  except:

    - schedules

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"



deploy-commands-stable-branch-development:

  extends: .deploy-commands-development
@@ -61,8 +65,8 @@ deploy-view-stable-branch-production: 
  <<: *deploy-stable-branch



.deploy-tag: &deploy-tag

  only:

    - tags

  rules:

    - if: $CI_COMMIT_TAG



deploy-commands-tag-development:

  extends: .deploy-commands-development

deployment.yml

+15 −11
Original line number Diff line number Diff line
@@ -2,21 +2,25 @@ include: 
  - local: '/_deployment.yml'



.deploy-support-branch: &deploy-support-branch

  only:

    - branches

  except:

    - master

    - schedules

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH



deploy-support-branch-development:

  extends: .deploy-development

  <<: *deploy-support-branch



.deploy-stable-branch: &deploy-stable-branch

  only:

    - master

  except:

    - schedules

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"



deploy-stable-branch-development:

  extends: .deploy-development
@@ -27,8 +31,8 @@ deploy-stable-branch-production: 
  <<: *deploy-stable-branch



.deploy-tag: &deploy-tag

  only:

    - tags

  rules:

    - if: $CI_COMMIT_TAG



deploy-tag-development:

  extends: .deploy-development

maintenance.yml

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
    REGISTRY_PASS: ${CI_DEPLOY_PASSWORD}

    SERVICE: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

  script: relaunch

  only:

    - schedules

  rules:

    - if: $CI_PIPELINE_SOURCE == "schedule"



scheduled-run-development:

  extends: .scheduled-run

maven-building-functional-unit.yml

+2 −5
Original line number Diff line number Diff line 
include:

  - local: '/maven-building.yml'



variables:

  TEST_OUTPUT_PATH: target

  - local: '/_maven-building.yml'



maven-build-lib:

  extends: .maven-build

  stage: build-lib

  variables:

    MAVEN_PROJECT_NAME: ${CI_PROJECT_NAME}-lib

    PROJECT_ROOT_PATH: ${CI_PROJECT_NAME}-lib

    MAVEN_GOALS: deploy

    PROJECT_ROOT_PATH: ${CI_PROJECT_NAME}-lib

    BUILD_OUTPUT_PATH: target



.maven-build-microservice: