From 47a72b432cee1f58018992efd5765f521ad50a81 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Mon, 7 Jun 2021 14:45:46 +0000 Subject: [PATCH 1/5] Update Dockerfile --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 671cc39..6589e30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ # Start with the IronBank Image -FROM registry1.dso.mil/ironbank/sonarsource/sonarqube/sonarqube8-community:8.7.1-community +FROM registry1.dso.mil/ironbank/sonarsource/sonarqube/sonarqube8-community:8.9-community # Add needed Plugins -ADD https://github.com/dependency-check/dependency-check-sonar-plugin/releases/download/2.0.7/sonar-dependency-check-plugin-2.0.7.jar /opt/sonarqube/extensions/plugins/ -ADD https://github.com/SonarOpenCommunity/sonar-cxx/releases/download/cxx-1.3.2/sonar-c-plugin-1.3.2.1853.jar /opt/sonarqube/extensions/plugins/ -ADD https://github.com/SonarOpenCommunity/sonar-cxx/releases/download/cxx-1.3.2/sonar-cxx-plugin-1.3.2.1853.jar /opt/sonarqube/extensions/plugins/ +ADD https://github.com/dependency-check/dependency-check-sonar-plugin/releases/download/2.0.8/sonar-dependency-check-plugin-2.0.8.jar /opt/sonarqube/extensions/plugins/ +ADD https://github.com/SonarOpenCommunity/sonar-cxx/releases/download/cxx-1.3.3/sonar-c-plugin-1.3.3.2051.jar /opt/sonarqube/extensions/plugins/ +ADD https://github.com/SonarOpenCommunity/sonar-cxx/releases/download/cxx-2.0.2/sonar-cxx-plugin-2.0.2.2734.jar /opt/sonarqube/extensions/plugins/ ADD https://github.com/dmeiners88/sonarqube-prometheus-exporter/releases/download/v1.0.0-SNAPSHOT-2018-07-04/sonar-prometheus-exporter-1.0.0-SNAPSHOT.jar /opt/sonarqube/extensions/plugins/ ADD https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.0.0/sonar-auth-oidc-plugin-2.0.0.jar /opt/sonarqube/extensions/plugins/ -ADD https://github.com/OtherDevOpsGene/zap-sonar-plugin/releases/download/sonar-zap-plugin-2.0.2/sonar-zap-plugin-2.0.2.jar /opt/sonarqube/extensions/plugins/ +ADD https://github.com/OtherDevOpsGene/zap-sonar-plugin/releases/download/sonar-zap-plugin-2.2.0/sonar-zap-plugin-2.2.0.jar /opt/sonarqube/extensions/plugins/ USER root RUN chown -R sonarqube:sonarqube /opt/sonarqube/extensions/plugins USER sonarqube -- GitLab From c8689e5c8a223a241cc3bc706ddef0e3dd90b761 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Mon, 7 Jun 2021 14:47:41 +0000 Subject: [PATCH 2/5] Update values.yaml --- chart/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/values.yaml b/chart/values.yaml index 7bb5d87..f0c0dd6 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -20,7 +20,7 @@ OpenShift: image: repository: registry.dso.mil/platform-one/big-bang/apps/developer-tools/sonarqube/sonarqube8-community-bb - tag: 8.7.1-community-bb + tag: 8.9-community-bb pullPolicy: IfNotPresent # If using a private repository, the name of the imagePullSecret to use pullSecret: private-registry @@ -376,4 +376,4 @@ networkPolicies: enabled: false ingressLabels: app: istio-ingressgateway - istio: ingressgateway \ No newline at end of file + istio: ingressgateway -- GitLab From e72392da6cef72cddc9913b7028c0f50c47c6676 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Mon, 7 Jun 2021 14:48:56 +0000 Subject: [PATCH 3/5] Update Chart.yaml --- chart/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 162b121..36a5843 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 8.7.1-community +appVersion: 8.9-community name: sonarqube description: SonarQube is an open sourced code quality scanning tool -version: 9.2.6-bb.12 +version: 9.2.6-bb.13 keywords: - coverage - security -- GitLab From 53214225fd9c9e7f0a98fad224e92ebd5f175e57 Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Mon, 7 Jun 2021 14:53:28 +0000 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aea70d8..d6c7ee6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). --- +## [9.2.6-bb.13] - 2021-06-07 +### Upgrade +- Upgraded Sonarqube to ironbank version 8.9. +- Bigbang plugins have been upgraded to the latest versions: + - dependency-check-sonar-plugin version 2.0.8 + - sonar-c-plugin version 1.3.3.2051 + - sonar-cxx-plugin version 2.0.2.2734 + - sonar-zap-plugin version 2.2.0 + ## [9.2.6-bb.12] - 2021-06-02 ### Modified - Modified helm-test network policy to be more restrictive. -- GitLab From 4485717bc6533416a621861af4deae633446fede Mon Sep 17 00:00:00 2001 From: Branden Cobb Date: Mon, 7 Jun 2021 15:29:17 -0600 Subject: [PATCH 5/5] cypress fix --- chart/tests/cypress/sonarqube-health.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/chart/tests/cypress/sonarqube-health.spec.js b/chart/tests/cypress/sonarqube-health.spec.js index 91dcead..5325684 100644 --- a/chart/tests/cypress/sonarqube-health.spec.js +++ b/chart/tests/cypress/sonarqube-health.spec.js @@ -10,6 +10,7 @@ describe('Basic Sonarqube', function() { cy.get('input[name="password"]').type(Cypress.env('newpassword')) cy.get('input[name="password_confirmation"]').type(Cypress.env('newpassword')) cy.get('button[id="change-password"]').click() + cy.contains("I understand the risk").click() cy.scrollTo('topRight') cy.get('a[class="dropdown-toggle navbar-avatar"]').click() cy.contains("My Account").click() -- GitLab