SONAR-25352 Re-activate the testing on Openshift

Author: carminevassallo

.cirrus/tasks_sonarqube.yml

@@ -8,13 +8,13 @@ sonarqube_chart_static_compatibility_test_task:
     - ./.cirrus/build_chart_dependencies.sh charts/sonarqube
     - ./.cirrus/unit_helm_compatibility_test.sh sonarqube
 
-# chart_testing_on_openshift_sonarqube_task:
-#   <<: *CHART_TESTING_ON_OPENSHIFT_TEMPLATE
-#   <<: *SKIP_IF_NOT_SONARQUBE
-#   env:
-#     - VERIFYING_CHART: sonarqube
-#   depends_on:
-#     - sonarqube_chart_static_compatibility_test
+chart_testing_on_openshift_sonarqube_task:
+  <<: *CHART_TESTING_ON_OPENSHIFT_TEMPLATE
+  <<: *SKIP_IF_NOT_SONARQUBE
+  env:
+    - VERIFYING_CHART: sonarqube
+  depends_on:
+    - sonarqube_chart_static_compatibility_test
 
 chart_testing_on_kind_sonarqube_task:
   <<: *CHART_TESTING_ON_KIND_TEMPLATE
@@ -34,7 +34,7 @@ sonarqube_chart_packaging_task:
     - ./.cirrus/sign_chart.sh sonarqube
   depends_on:
     - chart_testing_on_kind_sonarqube
-    # - chart_testing_on_openshift_sonarqube
+    - chart_testing_on_openshift_sonarqube
 
 sonarqube_push_to_repox_task:
   <<: *PUSH_TO_REPOX_TASK_TEMPLATE

.cirrus/tasks_sonarqube_dce.yml

@@ -8,13 +8,13 @@ sonarqube_dce_chart_static_compatibility_test_task:
     - ./.cirrus/build_chart_dependencies.sh charts/sonarqube-dce
     - ./.cirrus/unit_helm_compatibility_test.sh sonarqube-dce
 
-# chart_testing_on_openshift_sonarqube_dce_task:
-#   <<: *CHART_TESTING_ON_OPENSHIFT_TEMPLATE
-#   <<: *SKIP_IF_NOT_SONARQUBE_DCE
-#   env:
-#     - VERIFYING_CHART: sonarqube-dce
-#   depends_on:
-#     - sonarqube_dce_chart_static_compatibility_test
+chart_testing_on_openshift_sonarqube_dce_task:
+  <<: *CHART_TESTING_ON_OPENSHIFT_TEMPLATE
+  <<: *SKIP_IF_NOT_SONARQUBE_DCE
+  env:
+    - VERIFYING_CHART: sonarqube-dce
+  depends_on:
+    - sonarqube_dce_chart_static_compatibility_test
 
 chart_testing_on_kind_sonarqube_dce_task:
   <<: *CHART_TESTING_ON_KIND_TEMPLATE
@@ -37,7 +37,7 @@ sonarqube_dce_chart_packaging_task:
     - ./.cirrus/sign_chart.sh sonarqube-dce
   depends_on:
     - chart_testing_on_kind_sonarqube_dce
-    # - chart_testing_on_openshift_sonarqube_dce
+    - chart_testing_on_openshift_sonarqube_dce
 
 sonarqube_dce_push_to_repox_task:
   <<: *PUSH_TO_REPOX_TASK_TEMPLATE

.cirrus/tasks_templates.yml

@@ -72,7 +72,7 @@ chart_testing_on_openshift: &CHART_TESTING_ON_OPENSHIFT_TEMPLATE
     - chart-verifier version
   script:
     - mkdir -p "$(pwd)/report-${VERIFYING_CHART}"
-    - chart-verifier verify charts/"${VERIFYING_CHART}" --helm-install-timeout 20m -F charts/"${VERIFYING_CHART}"/openshift-verifier/values.yaml -n "${VERIFYING_CHART}" --openshift-version 4.16 > "$(pwd)/report-${VERIFYING_CHART}/report.yaml"
+    - chart-verifier verify -x images-are-certified charts/"${VERIFYING_CHART}" --helm-install-timeout 20m -F charts/"${VERIFYING_CHART}"/openshift-verifier/values.yaml -n "${VERIFYING_CHART}" --openshift-version 4.16 > "$(pwd)/report-${VERIFYING_CHART}/report.yaml"
   verifier_report_artifacts:
     path: "report-*/*.yaml"
   check_violations_script:

charts/sonarqube/ci/cirrus-values.yaml

@@ -5,7 +5,7 @@ image:
   pullSecrets:
     - name: pullsecret
   repository: "sonarsource/sonarqube"
-  tag: "25.6.0.109173-community"
+  tag: "25.6.0.109173-master-community"
 monitoringPasscode: "test"
 postgresql:
   securityContext:

charts/sonarqube/openshift-verifier/values.yaml

@@ -16,6 +16,6 @@ image:
   pullSecrets:
     - name: pullsecret
   repository: "sonarsource/sonarqube"
-  tag: "25.6.0.109173-community"
+  tag: "25.6.0.109173-master-community"
 
 monitoringPasscode: "test"

tests/unit-test/schema_test.go

@@ -22,8 +22,8 @@ var chartPath string = "../../charts/sonarqube"
 // release name
 var releaseName string = "sonarqube"
 
-// Community Build
-var expectedContainerImage string = "sonarqube:25.6.0.109173-community"
+// Community Build Version
+var expectedContainerImage string = "sonarqube:25.6.0.109173"
 
 // Ensure we are using the dry-run flag
 var helmOptions *helm.Options = &helm.Options{
@@ -87,7 +87,7 @@ func TestNoTagLatestCommunity(t *testing.T) {
 
 	actualContainers := renderedTemplate.Spec.Template.Spec.Containers
 	assert.Equal(t, 1, len(actualContainers))
-	assert.Equal(t, expectedContainerImage, actualContainers[0].Image)
+	assert.Equal(t, expectedContainerImage+"-community", actualContainers[0].Image)
 }
 
 func TestNoTagAppVersionDeveloper(t *testing.T) {
@@ -122,7 +122,7 @@ func TestShouldUseBuildNumber(t *testing.T) {
 
 	actualContainers := renderedTemplate.Spec.Template.Spec.Containers
 	assert.Equal(t, 1, len(actualContainers))
-	assert.Equal(t, expectedContainerImage, actualContainers[0].Image)
+	assert.Equal(t, expectedContainerImage+"-community", actualContainers[0].Image)
 }
 
 func TestShouldUseImageTag(t *testing.T) {
@@ -190,7 +190,7 @@ func TestCiCirrusValues(t *testing.T) {
 	var renderedTemplate appsv1.StatefulSet
 	helm.UnmarshalK8SYaml(t, output, &renderedTemplate)
 
-	expectedPrivateContainerImage := "sonarsource/" + expectedContainerImage
+	expectedPrivateContainerImage := "sonarsource/" + expectedContainerImage + "-master-community"
 	actualContainers := renderedTemplate.Spec.Template.Spec.Containers
 	assert.Equal(t, 1, len(actualContainers))
 	assert.Equal(t, expectedPrivateContainerImage, actualContainers[0].Image)
@@ -205,7 +205,7 @@ func TestCiOpenshiftVerifierValues(t *testing.T) {
 	var renderedTemplate appsv1.StatefulSet
 	helm.UnmarshalK8SYaml(t, output, &renderedTemplate)
 
-	expectedPrivateContainerImage := "sonarsource/" + expectedContainerImage
+	expectedPrivateContainerImage := "sonarsource/" + expectedContainerImage + "-master-community"
 	actualContainers := renderedTemplate.Spec.Template.Spec.Containers
 	assert.Equal(t, 1, len(actualContainers))
 	assert.Equal(t, expectedPrivateContainerImage, actualContainers[0].Image)