From 3dec31810a5358a7ab03fd23570893f60b494632 Mon Sep 17 00:00:00 2001
From: Mathieu Courtois <mathieu.courtois@edf.fr>
Date: Tue, 4 Feb 2025 18:09:59 +0100
Subject: [PATCH] [#34400] use pam image
---
.gitlabci/gitlab-ci-pleiade.yml | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/.gitlabci/gitlab-ci-pleiade.yml b/.gitlabci/gitlab-ci-pleiade.yml
index 9e12728..ce49944 100644
--- a/.gitlabci/gitlab-ci-pleiade.yml
+++ b/.gitlabci/gitlab-ci-pleiade.yml
@@ -15,6 +15,8 @@ workflow:
rules:
- if: $CI_MERGE_REQUEST_IID
# seems redudant using fast-forward merges
+ auto_cancel:
+ on_new_commit: interruptible
stages:
- setup
@@ -24,11 +26,13 @@ image:
name: ${IMAGE_URL}
prepare:
+ interruptible: true
stage: setup
script:
- .gitlabci/prepare.sh
unittests:
+ interruptible: true
stage: test
needs: ["prepare"]
script:
@@ -43,25 +47,28 @@ unittests:
junit: share/test/run_testcases.xml
auto_install:
+ interruptible: true
stage: test
needs: ["prepare", "unittests"]
script:
- .gitlabci/test_auto_install.sh
-sonarqube-check:
+sonarqube:
+ interruptible: true
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
+ name: nexus.retd.edf.fr:5012/sonarsource/sonar-scanner-cli:latest
+ entrypoint: ["/bin/sh", "-c"]
script:
- sonar-scanner
+ -Dsonar.projectBaseDir=.
+ -Dsonar.sources=.
+ -Dsonar.projectKey="gitlab-${CI_PROJECT_ID}"
+ -Dsonar.projectName="${CI_PROJECT_PATH_SLUG}"
+ -Dsonar.host.url="${SQ_SERVER}"
+ -Dsonar.login="${SQ_TOKEN}"
+ variables:
+ SQ_SERVER: "https://sonar.pleiade.edf.fr:443"
allow_failure: true
# only:
# - main
--
GitLab