diff --git a/README.md b/README.md index 873c0878419142dd1f046d8e7589329e0c9a36e2..ac6a623b91d23e1d6c267aad7fdf1187d045f1d7 100644 --- a/README.md +++ b/README.md @@ -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" diff --git a/templates/gitlab-ci-sonar-vault.yml b/templates/gitlab-ci-sonar-vault.yml index 3f7754b5eb11e4d1a833aa317dce9c1ae83cd62b..7b496b2b6bd5d111ae58df2c2f3c0539413a59c6 100644 --- a/templates/gitlab-ci-sonar-vault.yml +++ b/templates/gitlab-ci-sonar-vault.yml @@ -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: diff --git a/templates/gitlab-ci-sonar.yml b/templates/gitlab-ci-sonar.yml index 756cba00dab9ce8671083546320f9df211bdc389..c31c5d4aee89e7ed750783930adc5a4b095ea31c 100644 --- a/templates/gitlab-ci-sonar.yml +++ b/templates/gitlab-ci-sonar.yml @@ -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