chore(release): restore catalog naming and fix test

apache · Nov 13, 2019 · 9b37384 · 9b37384
1 parent aed5b16
commit 9b37384
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml b/deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml
@@ -18,7 +18,7 @@
 apiVersion: camel.apache.org/v1alpha1
 kind: CamelCatalog
 metadata:
-  name: camel-catalog-quarkus-0.3.1-1.0.7
+  name: camel-quarkus-catalog-0.3.1-1.0.7
   labels:
     app: camel-k
     camel.apache.org/catalog.version: 3.0.0-RC3

diff --git a/deploy/resources.go b/deploy/resources.go
diff --git a/pkg/controller/integrationplatform/create_test.go b/pkg/controller/integrationplatform/create_test.go
@@ -63,7 +63,13 @@ func TestCreate(t *testing.T) {
 				n := strings.TrimSuffix(k, ".yaml")
 				n = strings.ToLower(n)
 
-				if c.Name == n {
+				name := c.Name
+				// TODO can be safely removed when catalog naming is fixed in runtime maven plugin
+				if strings.HasPrefix(name,"camel-quarkus-catalog") {
+					name = "camel-catalog-quarkus" + strings.TrimPrefix(name, "camel-quarkus-catalog")
+				}
+
+				if name == n {
 					found = true
 				}
 			}