From 9efac10874cd061a7332199598e255d4a031e3c6 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 27 May 2017 14:57:40 +0100 Subject: [PATCH] tests: Remove systctl test package It is not longer needed. Signed-off-by: Rolf Neugebauer --- test/pkg/sysctl/Dockerfile | 4 ---- test/pkg/sysctl/Makefile | 29 ----------------------------- test/pkg/sysctl/check.sh | 11 ----------- 3 files changed, 44 deletions(-) delete mode 100644 test/pkg/sysctl/Dockerfile delete mode 100644 test/pkg/sysctl/Makefile delete mode 100755 test/pkg/sysctl/check.sh diff --git a/test/pkg/sysctl/Dockerfile b/test/pkg/sysctl/Dockerfile deleted file mode 100644 index 99cf97e6d..000000000 --- a/test/pkg/sysctl/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM alpine:edge -ADD . ./ -ENTRYPOINT ["/bin/sh", "/check.sh"] -LABEL org.mobyproject.config='{"net": "host","pid": "host", "ipc": "host", "readonly": true}' diff --git a/test/pkg/sysctl/Makefile b/test/pkg/sysctl/Makefile deleted file mode 100644 index be9319aa9..000000000 --- a/test/pkg/sysctl/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -.PHONY: tag push - -BASE=alpine:3.5 -IMAGE=test-sysctl - -default: push - -hash: Dockerfile check.sh - DOCKER_CONTENT_TRUST=1 docker pull $(BASE) - tar cf - $^ | docker build --no-cache -t $(IMAGE):build - - docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash - -push: hash - DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ - DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)) - docker rmi $(IMAGE):build - rm -f hash - -tag: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ - docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) - docker rmi $(IMAGE):build - rm -f hash - -clean: - rm -f hash - -.DELETE_ON_ERROR: diff --git a/test/pkg/sysctl/check.sh b/test/pkg/sysctl/check.sh deleted file mode 100755 index 28704978f..000000000 --- a/test/pkg/sysctl/check.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -function failed { - printf "sysctl test suite FAILED\n" >&1 - exit 1 -} - -# this is a non default value, so will fail if sysctl failed -[ "$(sysctl -n fs.inotify.max_user_watches)" -eq 524288 ] || failed - -printf "Sysctl test suite PASSED\n" >&1