Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SonarQube
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SmartDataLab
public
CI-CD components
SonarQube
Commits
6748a724
Commit
6748a724
authored
2 months ago
by
Benguria Elguezabal, Gorka
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'upstream/master'
# Conflicts: # CHANGELOG.md
parents
74cf102c
a21ebb98
No related branches found
Branches containing commit
Tags
4.2
4.2.4
Tags containing commit
No related merge requests found
Pipeline
#170004
passed
2 months ago
Stage: .pre
Stage: build
Stage: test
Stage: publish
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+4
-4
4 additions, 4 deletions
README.md
templates/gitlab-ci-sonar-vault.yml
+1
-1
1 addition, 1 deletion
templates/gitlab-ci-sonar-vault.yml
templates/gitlab-ci-sonar.yml
+1
-4
1 addition, 4 deletions
templates/gitlab-ci-sonar.yml
with
6 additions
and
9 deletions
README.md
+
4
−
4
View file @
6748a724
...
...
@@ -16,7 +16,7 @@ Add the following to your `.gitlab-ci.yml`:
```
yaml
include
:
# 1: include the component
-
component
:
$CI_SERVER_FQDN/to-be-continuous/sonar/gitlab-ci-sonar@4.
2.4
-
component
:
$CI_SERVER_FQDN/to-be-continuous/sonar/gitlab-ci-sonar@4.
3.0
# 2: set/override component inputs
inputs
:
host-url
:
https://sonarqube.acme.host
# ⚠ this is only an example
...
...
@@ -30,7 +30,7 @@ Add the following to your `.gitlab-ci.yml`:
include
:
# 1: include the template
-
project
:
'
to-be-continuous/sonar'
ref
:
'
4.
2.4
'
ref
:
'
4.
3.0
'
file
:
'
/templates/gitlab-ci-sonar.yml'
variables
:
...
...
@@ -118,9 +118,9 @@ With:
```
yaml
include
:
# main template
-
component
:
$CI_SERVER_FQDN/to-be-continuous/sonar/gitlab-ci-sonar@4.
2.4
-
component
:
$CI_SERVER_FQDN/to-be-continuous/sonar/gitlab-ci-sonar@4.
3.0
# Vault variant
-
component
:
$CI_SERVER_FQDN/to-be-continuous/sonar/gitlab-ci-sonar-vault@4.
2.4
-
component
:
$CI_SERVER_FQDN/to-be-continuous/sonar/gitlab-ci-sonar-vault@4.
3.0
inputs
:
# audience claim for JWT
vault-oidc-aud
:
"
https://vault.acme.host"
...
...
This diff is collapsed.
Click to expand it.
templates/gitlab-ci-sonar-vault.yml
+
1
−
1
View file @
6748a724
...
...
@@ -22,7 +22,7 @@ variables:
sonar
:
services
:
-
name
:
"
$TBC_TRACKING_IMAGE"
command
:
[
"
--service"
,
"
sonar"
,
"
4.
2.4
"
]
command
:
[
"
--service"
,
"
sonar"
,
"
4.
3.0
"
]
-
name
:
"
$TBC_VAULT_IMAGE"
alias
:
"
vault-secrets-provider"
variables
:
...
...
This diff is collapsed.
Click to expand it.
templates/gitlab-ci-sonar.yml
+
1
−
4
View file @
6748a724
...
...
@@ -91,9 +91,6 @@ workflow:
-
when
:
on_success
variables
:
# variabilized tracking image
TBC_TRACKING_IMAGE
:
registry.gitlab.com/to-be-continuous/tools/tracking:master
# Sonar
SONAR_SCANNER_IMAGE
:
$[[ inputs.scanner-image ]]
SONAR_HOST_URL
:
$[[ inputs.host-url ]]
...
...
@@ -398,7 +395,7 @@ sonar:
entrypoint
:
[
"
"
]
services
:
-
name
:
"
$TBC_TRACKING_IMAGE"
command
:
[
"
--service"
,
"
sonar"
,
"
4.
2.4
"
]
command
:
[
"
--service"
,
"
sonar"
,
"
4.
3.0
"
]
variables
:
# see: https://docs.sonarsource.com/sonarqube-server/latest/devops-platform-integration/gitlab-integration/setting-up-at-project-level/
SONAR_USER_HOME
:
"
${CI_PROJECT_DIR}/.sonar"
# Defines the location of the analysis task cache
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment