filter_scheme: clean redundant filter scheme scripts

Let's clean all duplicated codes and just retain the specific configuration file. Fixes: kata-containers#1570 Signed-off-by: Penny Zheng <[email protected]>
devimc · May 15, 2019 · 29d18e9 · 29d18e9
1 parent 5b83a99
commit 29d18e9
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 324 deletions.
diff --git a/.ci/aarch64/filter_docker_aarch64.sh b/.ci/aarch64/filter_docker_aarch64.sh
diff --git a/.ci/aarch64/filter_test_aarch64.sh b/.ci/aarch64/filter_test_aarch64.sh
diff --git a/.ci/hypervisors/firecracker/filter_docker_firecracker.sh b/.ci/hypervisors/firecracker/filter_docker_firecracker.sh
diff --git a/.ci/ppc64le/filter_docker_ppc64le.sh b/.ci/ppc64le/filter_docker_ppc64le.sh
diff --git a/.ci/ppc64le/filter_test_ppc64le.sh b/.ci/ppc64le/filter_test_ppc64le.sh
diff --git a/.ci/s390x/filter_docker_s390x.sh b/.ci/s390x/filter_docker_s390x.sh
diff --git a/.ci/s390x/filter_test_s390x.sh b/.ci/s390x/filter_test_s390x.sh
diff --git a/Makefile b/Makefile
@@ -12,10 +12,14 @@ UNION := functional debug-console docker crio docker-compose network netmon \
 	docker-stability oci openshift kubernetes swarm vm-factory \
 	entropy ramdisk shimv2 tracing
 
-# skipped test suites for docker integration tests
-FILTER_FILE = .ci/hypervisors/$(KATA_HYPERVISOR)/filter_docker_$(KATA_HYPERVISOR).sh
+# filter scheme script for docker integration test suites
+FILTER_FILE = .ci/filter/filter_docker_test.sh
+
+# skipped docker integration tests for Firecraker
+# Firecracker configuration file
+FIRECRACKER_CONFIG = .ci/hypervisors/firecracker/configuration_firecracker.yaml
 ifneq ($(wildcard $(FILTER_FILE)),)
-	SKIP := $(shell bash -f $(FILTER_FILE))
+SKIP_FIRECRACKER := $(shell bash -c '$(FILTER_FILE) $(FIRECRACKER_CONFIG)')
 endif
 
 # get arch
@@ -63,7 +67,7 @@ ifeq ($(RUNTIME),)
 endif
 
 ifeq ($(KATA_HYPERVISOR),firecracker)
-	./ginkgo -failFast -v -focus "${FOCUS}" -skip "${SKIP}" \
+	./ginkgo -failFast -v -focus "${FOCUS}" -skip "${SKIP_FIRECRACKER}" \
 		./integration/docker/ -- -runtime=${RUNTIME} -timeout=${TIMEOUT}
 else ifeq ($(ARCH),$(filter $(ARCH), aarch64 s390x ppc64le))
 	./ginkgo -failFast -v -focus "${FOCUS}" -skip "${SKIP}" \

diff --git a/arch/aarch64-options.mk b/arch/aarch64-options.mk
@@ -3,8 +3,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# configuration file
+CONFIG := .ci/aarch64/configuration_aarch64.yaml
+
 # union for 'make test'
-UNION := $(shell bash -f .ci/aarch64/filter_test_aarch64.sh)
+UNION := $(shell bash -c '.ci/filter/filter_test_union.sh $(CONFIG)')
 
 # skiped test suites for docker integration tests
-SKIP := $(shell bash -f .ci/aarch64/filter_docker_aarch64.sh)
+SKIP := $(shell bash -c '.ci/filter/filter_docker_test.sh $(CONFIG)')
diff --git a/arch/ppc64le-options.mk b/arch/ppc64le-options.mk
@@ -3,8 +3,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# configuration file
+CONFIG := .ci/ppc64le/configuration_ppc64le.yaml
+
 # union for 'make test'
-UNION := $(shell bash -f .ci/ppc64le/filter_test_ppc64le.sh)
+UNION := $(shell bash -c '.ci/filter/filter_test_union.sh $(CONFIG)')
 
 # skiped test suites for docker integration tests
-SKIP := $(shell bash -f .ci/ppc64le/filter_docker_ppc64le.sh)
+SKIP := $(shell bash -c '.ci/filter/filter_docker_test.sh $(CONFIG)')
+
diff --git a/arch/s390x-options.mk b/arch/s390x-options.mk
@@ -3,8 +3,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# configuration file
+CONFIG := .ci/s390x/configuration_s390x.yaml
+
 # union for 'make test'
-UNION := $(shell bash -f .ci/s390x/filter_test_s390x.sh)
+UNION := $(shell bash -c '.ci/filter/filter_test_union.sh $(CONFIG)')
 
 # skiped test suites for docker integration tests
-SKIP := $(shell bash -f .ci/s390x/filter_docker_s390x.sh)
+SKIP := $(shell bash -c '.ci/filter/filter_docker_test.sh $(CONFIG)')
+