Merge pull request #196 from vmware-tanzu/191-fix-kuttle-dirs

Seperate kuttl tests for each controller

Makefile

@@ -73,9 +73,18 @@ test-integration: test-gen-manifests test-gen-objects
 test-kuttl: build test-gen-manifests
 	if [ -n "$$focus" ]; then kubectl kuttl test --test $$(basename $(focus)); else kubectl kuttl test; fi
 
+.PHONY: test-kuttl-pipeline-service
+test-kuttl-pipeline-service: build test-gen-manifests
+	if [ -n "$$focus" ]; then kubectl kuttl test ./tests/kuttl/pipeline-service --test $$(basename $(focus)); else kubectl kuttl test ./tests/kuttl/pipeline-service; fi
+
+.PHONY: test-kuttl-supply-chain
+test-kuttl-supply-chain: build test-gen-manifests
+	if [ -n "$$focus" ]; then kubectl kuttl test ./tests/kuttl/supply-chain --test $$(basename $(focus)); else kubectl kuttl test ./tests/kuttl/supply-chain; fi
+
+
 .PHONY: list-kuttl
 list-kuttl:
-	(cd tests/kuttl && find . -maxdepth 1 -type d)
+	(cd tests/kuttl && find . -maxdepth 2 -type d)
 
 .PHONY: test-kuttl-kind
 test-kuttl-kind: build

kuttl-test.yaml

@@ -16,7 +16,8 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 startControlPlane: true
 testDirs:
-  - tests/kuttl
+  - tests/kuttl/pipeline-service
+  - tests/kuttl/supply-chain
 crdDir: config/crd/bases
 manifestDirs:
   - tests/resources/crds

tests/kuttl/pipeline-service/CRDs/00-assert.yaml

@@ -0,0 +1,30 @@
+# Copyright 2021 VMware
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: pipelines.carto.run
+spec:
+  scope: Namespaced
+
+---
+
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: runtemplates.carto.run
+spec:
+  scope: Namespaced

tests/kuttl/CRDs/00-assert.yaml → tests/kuttl/supply-chain/CRDs/00-assert.yaml

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+---
 
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -63,21 +64,3 @@ metadata:
   name: workloads.carto.run
 spec:
   scope: Namespaced
-
----
-
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: pipelines.carto.run
-spec:
-  scope: Namespaced
-
----
-
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: runtemplates.carto.run
-spec:
-  scope: Namespaced