fix e2e

Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
operator-framework · Jun 6, 2024 · fc6906f · fc6906f
1 parent cf4669d
commit fc6906f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -202,10 +202,11 @@ kind-load-test-artifacts: $(KIND) #EXHELP Load the e2e testdata container images
 	$(KIND) load docker-image localhost/testdata/bundles/registry-v1/package-with-webhooks:v1.0.0 --name $(KIND_CLUSTER_NAME)
 
 registry-load-bundles: ## Load selected e2e testdata container images created in kind-load-bundles into registry
-	testdata/bundles/registry-v1/prometheus-operator.v1.0.0/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-operator:v1.0.0 prometheus-operator.v1.0.0
-	testdata/bundles/registry-v1/prometheus-operator.v1.0.0/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-operator:v1.0.1 prometheus-operator.v1.0.1
-	testdata/bundles/registry-v1/prometheus-operator.v1.0.0/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-operator:v1.2.0 prometheus-operator.v1.2.0
-	testdata/bundles/registry-v1/prometheus-operator.v1.0.0/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-operator:v2.0.0 prometheus-operator.v2.0.0
+	testdata/bundles/registry-v1/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-operator:v1.0.0 prometheus-operator.v1.0.0 prometheus-operator.v1.0.0
+	testdata/bundles/registry-v1/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-operator:v1.0.1 prometheus-operator.v1.0.1 prometheus-operator.v1.0.0
+	testdata/bundles/registry-v1/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-operator:v1.2.0 prometheus-operator.v1.2.0 prometheus-operator.v1.0.0
+	testdata/bundles/registry-v1/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-operator:v2.0.0 prometheus-operator.v2.0.0 prometheus-operator.v1.0.0
+	testdata/bundles/registry-v1/build-push-e2e-bundle.sh ${E2E_REGISTRY_NAMESPACE} $(DNS_NAME):5000/bundles/registry-v1/prometheus-with-webhooks.v1.0.0 prometheus-with-webhooks.v1.0.0 package-with-webhooks.v1.0.0
 
 #SECTION Build
 

diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go
@@ -102,7 +102,7 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
 		}
 		assert.Equal(ct, metav1.ConditionTrue, cond.Status)
 		assert.Equal(ct, ocv1alpha1.ReasonUnpackSuccess, cond.Reason)
-		assert.Contains(ct, cond.Message, "Successfully unpacked")
+		assert.Contains(ct, cond.Message, "unpack successful")
 	}, pollDuration, pollInterval)
 
 	t.Log("By eventually installing the package successfully")

diff --git a/...-operator.v1.0.0/build-push-e2e-bundle.sh → ...dles/registry-v1/build-push-e2e-bundle.sh b/...-operator.v1.0.0/build-push-e2e-bundle.sh → ...dles/registry-v1/build-push-e2e-bundle.sh
@@ -7,14 +7,14 @@ set -o pipefail
 help="
 build-push-e2e-bundle.sh is a script to build and push the e2e bundle image using kaniko.
 Usage:
-  build-push-e2e-bundle.sh [NAMESPACE] [TAG] [BUNDLE_DIR] [BUNDLE_NAME]
+  build-push-e2e-bundle.sh [NAMESPACE] [TAG] [BUNDLE_NAME] [BUNDLE_DIR]
 
 Argument Descriptions:
   - NAMESPACE is the namespace the kaniko Job should be created in
   - TAG is the full tag used to build and push the catalog image
 "
 
-if [[ "$#" -ne 3 ]]; then
+if [[ "$#" -ne 4 ]]; then
   echo "Illegal number of arguments passed"
   echo "${help}"
   exit 1
@@ -23,8 +23,9 @@ fi
 
 namespace=$1
 tag=$2
-bundle_dir="testdata/bundles/registry-v1/prometheus-operator.v1.0.0"
 bundle_name=$3
+package_name=$4
+bundle_dir="testdata/bundles/registry-v1/${package_name}"
 
 echo "${namespace}" "${tag}"
 

diff --git a/testdata/bundles/registry-v1/package-with-webhooks.v1.0.0/Dockerfile b/testdata/bundles/registry-v1/package-with-webhooks.v1.0.0/Dockerfile
@@ -12,4 +12,4 @@ LABEL operators.operatorframework.io.metrics.project_layout=unknown
 
 # Copy files to locations specified by labels.
 COPY manifests /manifests/
-COPY metadata /metadata/
+COPY metadata /metadata/
diff --git a/...ry-v1/prometheus-operator.v1.0.0/manifests/monitoring.coreos.com_alertmanagerconfigs.yaml b/...ry-v1/prometheus-operator.v1.0.0/manifests/monitoring.coreos.com_alertmanagerconfigs.yaml
@@ -4418,9 +4418,9 @@ spec:
                       description: Matcher defines how to match on alert's labels.
                       properties:
                         matchType:
-                          description: Match operation available with AlertManager
+                          description: 'Match operation available with AlertManager
                             >= v0.22.0 and takes precedence over Regex (deprecated)
-                            if non-empty.
+                            if non-empty.'
                           enum:
                           - '!='
                           - =

diff --git a/testdata/catalogs/test-catalog/catalog.yaml b/testdata/catalogs/test-catalog/catalog.yaml
@@ -74,7 +74,7 @@ entries:
 schema: olm.bundle
 name: package-with-webhooks.1.0.0
 package: package-with-webhooks
-image: localhost/testdata/bundles/registry-v1/package-with-webhooks:v1.0.0
+image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-with-webhooks.v1.0.0
 properties:
   - type: olm.package
     value: