test(scorecard): fix rebasing skipped commit (#780) (#782)

* Merge pull request #8 from ebaron/scorecard-methods test(scorecard): use methods for more easily passing data * update bundle image (cherry picked from commit b397095) Co-authored-by: Ming Yu Wang <90855268+mwangggg@users.noreply.github.com>
cryostatio · Mar 27, 2024 · 0b380d2 · 0b380d2
1 parent db115b3
commit 0b380d2
Show file tree

Hide file tree

Showing 8 changed files with 151 additions and 175 deletions.
diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -53,7 +53,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
     containerImage: quay.io/cryostat/cryostat-operator:3.0.0-dev
-    createdAt: "2024-03-27T18:00:37Z"
+    createdAt: "2024-03-27T18:30:58Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {

diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml
@@ -70,7 +70,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927
     labels:
       suite: cryostat
       test: operator-install
@@ -80,7 +80,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
-    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -90,7 +90,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
-    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -100,7 +100,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
-    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -110,7 +110,7 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
-    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250
+    image: quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927
     labels:
       suite: cryostat
       test: cryostat-report

diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml
@@ -8,7 +8,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - operator-install
-    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927"
     labels:
       suite: cryostat
       test: operator-install
@@ -18,7 +18,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
-    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927"
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -28,7 +28,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
-    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927"
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -38,7 +38,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
-    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927"
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -48,7 +48,7 @@
     entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
-    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327175250"
+    image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240327182927"
     labels:
       suite: cryostat
       test: cryostat-report
diff --git a/internal/images/custom-scorecard-tests/main.go b/internal/images/custom-scorecard-tests/main.go
@@ -111,15 +111,15 @@ func runTests(testNames []string, bundle *apimanifests.Bundle, namespace string,
 	for _, testName := range testNames {
 		switch testName {
 		case tests.OperatorInstallTestName:
-			results = append(results, tests.OperatorInstallTest(bundle, namespace))
+			results = append(results, *tests.OperatorInstallTest(bundle, namespace, openShiftCertManager))
 		case tests.CryostatCRTestName:
-			results = append(results, tests.CryostatCRTest(bundle, namespace, openShiftCertManager))
+			results = append(results, *tests.CryostatCRTest(bundle, namespace, openShiftCertManager))
 		case tests.CryostatRecordingTestName:
-			results = append(results, tests.CryostatRecordingTest(bundle, namespace, openShiftCertManager))
+			results = append(results, *tests.CryostatRecordingTest(bundle, namespace, openShiftCertManager))
 		case tests.CryostatConfigChangeTestName:
-			results = append(results, tests.CryostatConfigChangeTest(bundle, namespace, openShiftCertManager))
+			results = append(results, *tests.CryostatConfigChangeTest(bundle, namespace, openShiftCertManager))
 		case tests.CryostatReportTestName:
-			results = append(results, tests.CryostatReportTest(bundle, namespace, openShiftCertManager))
+			results = append(results, *tests.CryostatReportTest(bundle, namespace, openShiftCertManager))
 		default:
 			log.Fatalf("unknown test found: %s", testName)
 		}