Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pika==1.3.0
prompt-toolkit==3.0.30; python_full_version >= "3.6.2" and python_version >= "3.7"
psycopg2-binary==2.9.3; python_version >= "3.6"
ptyprocess==0.7.0; sys_platform != "win32" and python_version >= "3.7"
pygments==2.12.0; python_version >= "3.7"
pygments==2.14.0; python_version >= "3.7"
pyjwt==2.4.0; python_version >= "3.6"
pyoai @ git+https://github.com/infrae/pyoai@5f6eba12
pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.6"
Expand Down