From cea9a7c8c692d64c0cbdb1a2e6b4da019cb10169 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Fri, 26 May 2017 15:01:10 -0700 Subject: [PATCH] Also sign all test packages and update relevant test cases to use org key Signed-off-by: Riyaz Faizullabhoy --- test/cases/000_build/000_outputs/test.yml | 8 ++------ .../000_qemu/000_run_kernel/test.yml | 8 ++------ .../010_platforms/000_qemu/010_run_iso/test.yml | 7 ++----- .../010_platforms/000_qemu/020_run_efi/test.yml | 7 ++----- .../010_platforms/000_qemu/030_run_qcow/test.yml | 7 ++----- .../010_platforms/000_qemu/100_container/test.yml | 7 ++----- .../010_hyperkit/000_run_kernel/test.yml | 7 ++----- .../000_config_4.4.x/test-kernel-config.yml | 7 ++----- .../001_config_4.9.x/test-kernel-config.yml | 7 ++----- .../002_config_4.10.x/test-kernel-config.yml | 7 ++----- .../003_config_4.11.x/test-kernel-config.yml | 7 ++----- test/cases/020_kernel/010_kmod_4.9.x/kmod.yml | 7 ++----- .../000_docker-bench/test-docker-bench.yml | 15 ++------------- .../cases/040_packages/000_sysctl/test-sysctl.yml | 8 ++------ test/cases/040_packages/001_mkimage/mkimage.yml | 7 ++----- test/cases/040_packages/001_mkimage/run.yml | 4 ++-- test/pkg/docker-bench/Makefile | 4 ++-- test/pkg/kernel-config/Makefile | 4 ++-- test/pkg/ltp/Makefile | 4 ++-- test/pkg/poweroff/Makefile | 4 ++-- test/pkg/sysctl/Makefile | 4 ++-- test/pkg/virtsock/Makefile | 4 ++-- 22 files changed, 44 insertions(+), 100 deletions(-) diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index a281d6ded..01c29f495 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -10,9 +10,5 @@ onboot: image: "linuxkit/dhcpcd:7d2f17a0e5d1ef9a75a527821a9ab0d753b22e7e" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd - - linuxkit/dhcpcd + org: + - linuxkit diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index e5aaeef61..f6389b462 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -10,9 +10,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "10"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd - + org: + - linuxkit diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index e5aaeef61..932a99585 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -10,9 +10,6 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "10"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 354a2f50d..f6389b462 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -10,8 +10,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "10"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index 354a2f50d..f6389b462 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -10,8 +10,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "10"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 7c0fd1cb0..207a3792d 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -10,8 +10,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 354a2f50d..f6389b462 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -10,8 +10,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "10"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index 561b46251..4548eb07a 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -13,8 +13,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index d5ce54d86..aa89c9345 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -13,8 +13,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/020_kernel/002_config_4.10.x/test-kernel-config.yml b/test/cases/020_kernel/002_config_4.10.x/test-kernel-config.yml index b476bbe83..53c0b948d 100644 --- a/test/cases/020_kernel/002_config_4.10.x/test-kernel-config.yml +++ b/test/cases/020_kernel/002_config_4.10.x/test-kernel-config.yml @@ -13,8 +13,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index 85843f6eb..3ea94cd6d 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -13,8 +13,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index 1fc3fc0e0..dd21c6100 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -17,8 +17,5 @@ onboot: image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index 768cac35c..9e2cd08a5 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -45,16 +45,5 @@ services: capabilities: - all trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd - - linuxkit/ca-certificates - - linuxkit/sysctl - - linuxkit/sysfs - - linuxkit/binfmt - - linuxkit/format - - linuxkit/mount - - linuxkit/rngd - - linuxkit/dhcpcd + org: + - linuxkit diff --git a/test/cases/040_packages/000_sysctl/test-sysctl.yml b/test/cases/040_packages/000_sysctl/test-sysctl.yml index a21bd0782..3dea8667d 100644 --- a/test/cases/040_packages/000_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/000_sysctl/test-sysctl.yml @@ -13,9 +13,5 @@ onboot: - name: poweroff image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd - - linuxkit/sysctl + org: + - linuxkit diff --git a/test/cases/040_packages/001_mkimage/mkimage.yml b/test/cases/040_packages/001_mkimage/mkimage.yml index 8bcced824..93377745d 100644 --- a/test/cases/040_packages/001_mkimage/mkimage.yml +++ b/test/cases/040_packages/001_mkimage/mkimage.yml @@ -18,8 +18,5 @@ files: - path: data/cmdline source: run-cmdline trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd + org: + - linuxkit diff --git a/test/cases/040_packages/001_mkimage/run.yml b/test/cases/040_packages/001_mkimage/run.yml index 95f1253c8..2aadd392b 100644 --- a/test/cases/040_packages/001_mkimage/run.yml +++ b/test/cases/040_packages/001_mkimage/run.yml @@ -9,5 +9,5 @@ onboot: - name: poweroff image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" trust: - image: - - linuxkit/kernel + org: + - linuxkit diff --git a/test/pkg/docker-bench/Makefile b/test/pkg/docker-bench/Makefile index 8388678d9..be0f5be11 100644 --- a/test/pkg/docker-bench/Makefile +++ b/test/pkg/docker-bench/Makefile @@ -11,9 +11,9 @@ hash: Dockerfile bench_runner.sh docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash push: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ + DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ - docker push linuxkit/$(IMAGE):$(shell cat hash)) + DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash diff --git a/test/pkg/kernel-config/Makefile b/test/pkg/kernel-config/Makefile index 6aa8831a0..0c8e9c30d 100644 --- a/test/pkg/kernel-config/Makefile +++ b/test/pkg/kernel-config/Makefile @@ -11,9 +11,9 @@ hash: Dockerfile check.sh check-kernel-config.sh etc/linuxkit docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash push: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ + DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ - docker push linuxkit/$(IMAGE):$(shell cat hash)) + DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash diff --git a/test/pkg/ltp/Makefile b/test/pkg/ltp/Makefile index 53fcbeab0..862f71049 100644 --- a/test/pkg/ltp/Makefile +++ b/test/pkg/ltp/Makefile @@ -23,9 +23,9 @@ hash: Dockerfile.pkg ltp.tar check.sh $(DEPS) cat Dockerfile.pkg check.sh $(DEPS) | DOCKER_CONTENT_TRUST=1 docker run --rm -i $(SHASUM) sha1sum | sed 's/ .*//' > $@ push: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ + DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ - docker push linuxkit/$(IMAGE):$(shell cat hash)) + DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash diff --git a/test/pkg/poweroff/Makefile b/test/pkg/poweroff/Makefile index 9f254bf8d..b6637911b 100644 --- a/test/pkg/poweroff/Makefile +++ b/test/pkg/poweroff/Makefile @@ -11,9 +11,9 @@ hash: Dockerfile poweroff.sh docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash push: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ + DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ - docker push linuxkit/$(IMAGE):$(shell cat hash)) + DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash diff --git a/test/pkg/sysctl/Makefile b/test/pkg/sysctl/Makefile index aa7e8aa90..be9319aa9 100644 --- a/test/pkg/sysctl/Makefile +++ b/test/pkg/sysctl/Makefile @@ -11,9 +11,9 @@ hash: Dockerfile check.sh docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash push: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ + DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ - docker push linuxkit/$(IMAGE):$(shell cat hash)) + DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)) docker rmi $(IMAGE):build rm -f hash diff --git a/test/pkg/virtsock/Makefile b/test/pkg/virtsock/Makefile index 18d54480b..8e5d71545 100644 --- a/test/pkg/virtsock/Makefile +++ b/test/pkg/virtsock/Makefile @@ -11,5 +11,5 @@ tag: $(DEPS) docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) . push: tag - docker pull $(ORG)/$(IMAGE):$(HASH) || \ - docker push $(ORG)/$(IMAGE):$(HASH) + DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \ + DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)