Skip to content
Snippets Groups Projects
Commit 6748a724 authored by Benguria Elguezabal, Gorka's avatar Benguria Elguezabal, Gorka
Browse files

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md
parents 74cf102c a21ebb98
No related branches found
No related tags found
No related merge requests found
Pipeline #170004 passed
...@@ -16,7 +16,7 @@ Add the following to your `.gitlab-ci.yml`: ...@@ -16,7 +16,7 @@ Add the following to your `.gitlab-ci.yml`:
```yaml ```yaml
include: include:
# 1: include the component # 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 # 2: set/override component inputs
inputs: inputs:
host-url: https://sonarqube.acme.host # ⚠ this is only an example host-url: https://sonarqube.acme.host # ⚠ this is only an example
...@@ -30,7 +30,7 @@ Add the following to your `.gitlab-ci.yml`: ...@@ -30,7 +30,7 @@ Add the following to your `.gitlab-ci.yml`:
include: include:
# 1: include the template # 1: include the template
- project: 'to-be-continuous/sonar' - project: 'to-be-continuous/sonar'
ref: '4.2.4' ref: '4.3.0'
file: '/templates/gitlab-ci-sonar.yml' file: '/templates/gitlab-ci-sonar.yml'
variables: variables:
...@@ -118,9 +118,9 @@ With: ...@@ -118,9 +118,9 @@ With:
```yaml ```yaml
include: include:
# main template # 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 # 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: inputs:
# audience claim for JWT # audience claim for JWT
vault-oidc-aud: "https://vault.acme.host" vault-oidc-aud: "https://vault.acme.host"
......
...@@ -22,7 +22,7 @@ variables: ...@@ -22,7 +22,7 @@ variables:
sonar: sonar:
services: services:
- name: "$TBC_TRACKING_IMAGE" - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "sonar", "4.2.4"] command: ["--service", "sonar", "4.3.0"]
- name: "$TBC_VAULT_IMAGE" - name: "$TBC_VAULT_IMAGE"
alias: "vault-secrets-provider" alias: "vault-secrets-provider"
variables: variables:
......
...@@ -91,9 +91,6 @@ workflow: ...@@ -91,9 +91,6 @@ workflow:
- when: on_success - when: on_success
variables: variables:
# variabilized tracking image
TBC_TRACKING_IMAGE: registry.gitlab.com/to-be-continuous/tools/tracking:master
# Sonar # Sonar
SONAR_SCANNER_IMAGE: $[[ inputs.scanner-image ]] SONAR_SCANNER_IMAGE: $[[ inputs.scanner-image ]]
SONAR_HOST_URL: $[[ inputs.host-url ]] SONAR_HOST_URL: $[[ inputs.host-url ]]
...@@ -398,7 +395,7 @@ sonar: ...@@ -398,7 +395,7 @@ sonar:
entrypoint: [""] entrypoint: [""]
services: services:
- name: "$TBC_TRACKING_IMAGE" - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "sonar", "4.2.4"] command: ["--service", "sonar", "4.3.0"]
variables: variables:
# see: https://docs.sonarsource.com/sonarqube-server/latest/devops-platform-integration/gitlab-integration/setting-up-at-project-level/ # 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 SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment