Changes to compatibility tests

Author: thegridman

.github/workflows/compatibility-tests.yaml

@@ -76,6 +76,14 @@ jobs:
         kubectl version
         kubectl get nodes
         docker pull gcr.io/distroless/java
+        docker pull ghcr.io/oracle/coherence-operator:3.0.2
+        docker tag ghcr.io/oracle/coherence-operator:3.0.2 container-registry.oracle.com/middleware/coherence-operator:3.0.2
+        kind load docker-image --name operator container-registry.oracle.com/middleware/coherence-operator:3.0.2
+        docker pull ghcr.io/oracle/coherence-operator:3.0.2-utils
+        docker tag ghcr.io/oracle/coherence-operator:3.0.2-utils container-registry.oracle.com/middleware/coherence-operator:3.0.2-utils
+        kind load docker-image --name operator container-registry.oracle.com/middleware/coherence-operator:3.0.2-utils
+        docker pull oraclecoherence/coherence-ce:14.1.1-0-1
+        kind load docker-image --name operator oraclecoherence/coherence-ce:14.1.1-0-1
 
     - name: Code Review
       shell: bash

Makefile

@@ -474,7 +474,7 @@ compatibility-test: export OPERATOR_IMAGE := $(OPERATOR_IMAGE)
 compatibility-test: export COHERENCE_IMAGE := $(COHERENCE_IMAGE)
 compatibility-test: export UTILS_IMAGE := $(UTILS_IMAGE)
 compatibility-test: export GO_TEST_FLAGS_E2E := $(strip $(GO_TEST_FLAGS_E2E))
-compatibility-test: $(BUILD_TARGETS)/build-operator undeploy clean-namespace reset-namespace gotestsum
+compatibility-test: undeploy build-all-images $(BUILD_HELM)/coherence-operator-$(VERSION).tgz undeploy clean-namespace reset-namespace gotestsum
 	helm repo add coherence https://oracle.github.io/coherence-operator/charts
 	helm repo update
 	$(GOTESTSUM) --format standard-verbose --junitfile $(TEST_LOGS_DIR)/operator-e2e-compatibility-test.xml \

helm-charts/coherence-operator/templates/deployment.yaml

@@ -11,6 +11,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    name: coherence-operator
     control-plane: coherence
   name: coherence-operator-webhook-service
   namespace: {{ .Release.Namespace }}

test/e2e/compatibility/compatibility_test.go

@@ -24,7 +24,7 @@ func TestCompatibility(t *testing.T) {
 
 	ns := helper.GetTestNamespace()
 	name := "operator"
-	defer CleanupBlind(ns, name)
+	defer CleanupBlind(t, ns, name)
 
 	version := os.Getenv("COMPATIBLE_VERSION")
 	g.Expect(version).NotTo(BeEmpty(), "COMPATIBLE_VERSION environment variable has not been set")
@@ -104,11 +104,12 @@ func InstallCurrentVersion(g *GomegaWithT, ns, name string) {
 	g.Expect(len(pods)).To(Equal(1))
 }
 
-func CleanupBlind(namespace, name string) {
-	_ = Cleanup(namespace, name)
+func CleanupBlind(t *testing.T, namespace, name string) {
+	_ = Cleanup(t, namespace, name)
 }
 
-func Cleanup(namespace, name string) error {
+func Cleanup(t *testing.T, namespace, name string) error {
+	helper.DumpOperatorLogs(t, testContext)
 	_ = helper.WaitForCoherenceCleanup(testContext, namespace)
 	return UninstallOperator(namespace, name)
 }