Skip to content

Commit

Permalink
hotfix gitlab-ci.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
tonurmi committed Oct 3, 2022
1 parent bf99991 commit 4af2fc1
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,33 +51,6 @@ job_update:

# ~~~~~~~~~~~~~~~~~~~~~~~~

job_sonarqube_check:
tags:
- docker
stage: test
image:
name: sonarsource/sonar-scanner-cli:latest
entrypoint: [""]
variables:
SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
cache:
key: "${CI_JOB_NAME}"
paths:
- .sonar/cache
script:
- sonar-scanner
allow_failure: true
needs:
- job: job_integration_test
artifacts: true
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
allow_failure: true
- if: $CI_COMMIT_BRANCH =~ /^(master)$/ && $CI_PIPELINE_SOURCE !~ /^(web)$/
allow_failure: true
- if: $CI_COMMIT_BRANCH =~ /^(release)$/

job_integration_test:
environment: $GITLAB_ENV
stage: test
Expand Down Expand Up @@ -128,6 +101,33 @@ job_integration_test:
- if: $CI_COMMIT_BRANCH =~ /^(master)$/
- if: $CI_PIPELINE_SOURCE == "web"

job_sonarqube_check:
tags:
- docker
stage: test
image:
name: sonarsource/sonar-scanner-cli:latest
entrypoint: [""]
variables:
SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
cache:
key: "${CI_JOB_NAME}"
paths:
- .sonar/cache
script:
- sonar-scanner
allow_failure: true
needs:
- job: job_integration_test
artifacts: true
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
allow_failure: true
- if: $CI_COMMIT_BRANCH =~ /^(master)$/ && $CI_PIPELINE_SOURCE !~ /^(web)$/
allow_failure: true
- if: $CI_COMMIT_BRANCH =~ /^(release)$/

# ~~~~~~~~~~~~~~~~~~~~~~~~

job_clean_gitlab_env:
Expand Down

0 comments on commit 4af2fc1

Please sign in to comment.