From ee641ba03cb01c503ce5c3a86282a441b7c8ebc7 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Fri, 14 Apr 2017 12:24:35 -0500
Subject: [PATCH 1/4] test: Move virtsock use the linuxkit org

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 test/virtsock/Makefile                 | 10 +++++-----
 test/virtsock/test-virtsock-server.yml | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/virtsock/Makefile b/test/virtsock/Makefile
index 6bf850c9b..ea29d83cb 100644
--- a/test/virtsock/Makefile
+++ b/test/virtsock/Makefile
@@ -28,15 +28,15 @@ hash: Dockerfile.pkg $(DEPS)
 	find $^ -type f | xargs cat  | DOCKER_CONTENT_TRUST=1 docker run --rm -i $(SHASUM) sha1sum | sed 's/ .*//' > $@
 
 push: hash container
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash container
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml
index c9f86970b..481392b65 100644
--- a/test/virtsock/test-virtsock-server.yml
+++ b/test/virtsock/test-virtsock-server.yml
@@ -1,18 +1,18 @@
 kernel:
   # Alternatively:
-  # image: "mobylinux/kernel:4.10.4-0"
-  # image: "mobylinux/kernel:4.9.16-1"
-  # image: "mobylinux/kernel:4.9.14-0"
-  image: "mobylinux/kernel:4.9.x"
+  # image: "linuxkit/kernel:4.10.4-0"
+  # image: "linuxkit/kernel:4.9.16-1"
+  # image: "linuxkit/kernel:4.9.14-0"
+  image: "linuxkit/kernel:4.9.x"
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
-  - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
-  - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
-  - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
+  - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
+  - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
+  - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: sysctl
-    image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
+    image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
     net: host
     pid: host
     ipc: host
@@ -21,7 +21,7 @@ onboot:
     readonly: true
 services:
   - name: rngd
-    image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9"
+    image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314"
     capabilities:
      - CAP_SYS_ADMIN
     oomScoreAdj: -800
@@ -38,7 +38,7 @@ services:
     net: host
     oomScoreAdj: -800
   - name: virtsock-server
-    image: "mobylinux/test-virtsock:35fea96fd01f6edb67021c494ddf098fdb8bbca0"
+    image: "linuxkit/test-virtsock:cd2135acdc225f3bd0503678bb50bbd3e0b194b2"
     readonly: true
 outputs:
   - format: kernel+initrd

From 3448a804f100fa8edf98f4659305662fc0fa5787 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Fri, 14 Apr 2017 14:12:16 -0500
Subject: [PATCH 2/4] tests: Move kernel check test over to use linuxkit org

Also some other moby renames.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 Makefile                          |  2 +-
 test/check/Makefile               | 12 ++++++------
 test/check/check-kernel-config.sh |  2 +-
 test/check/check.sh               |  6 +++---
 test/check/etc/{moby => linuxkit} |  1 -
 test/test.yml                     | 10 +++++-----
 6 files changed, 16 insertions(+), 17 deletions(-)
 rename test/check/etc/{moby => linuxkit} (99%)

diff --git a/Makefile b/Makefile
index d0f6d65f0..e87122f90 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ install:
 	cp -R ./bin/* $(PREFIX)/bin
 
 define check_test_log
-	@cat $1 |grep -q 'Moby test suite PASSED'
+	@cat $1 |grep -q 'Kernel config test suite PASSED'
 endef
 
 .PHONY: test-hyperkit
diff --git a/test/check/Makefile b/test/check/Makefile
index 8a95e3452..de24bfc86 100644
--- a/test/check/Makefile
+++ b/test/check/Makefile
@@ -5,21 +5,21 @@ IMAGE=check
 
 default: push
 
-hash: Dockerfile check.sh check-kernel-config.sh etc/moby
+hash: Dockerfile check.sh check-kernel-config.sh etc/linuxkit
 	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 pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/test/check/check-kernel-config.sh b/test/check/check-kernel-config.sh
index d0fe52248..28dec1563 100755
--- a/test/check/check-kernel-config.sh
+++ b/test/check/check-kernel-config.sh
@@ -4,7 +4,7 @@ set -e
 
 echo "starting kernel config sanity test with /proc/config.gz"
 
-# decompress /proc/config.gz from the Moby host
+# decompress /proc/config.gz from the host
 UNZIPPED_CONFIG=$(zcat /proc/config.gz)
 
 kernelVersion="$(uname -r)"
diff --git a/test/check/check.sh b/test/check/check.sh
index 832cec8fa..b28311d9b 100755
--- a/test/check/check.sh
+++ b/test/check/check.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 
 function failed {
-	printf "Moby test suite FAILED\n"
+	printf "Kernel config test suite FAILED\n"
 	/sbin/poweroff -f
 }
 
 /check-kernel-config.sh || failed
 bash /check-config.sh || failed
 
-printf "Moby test suite PASSED\n"
+printf "Kernel config test suite PASSED\n"
 
-cat /etc/moby
+cat /etc/linuxkit
 
 /sbin/poweroff -f
diff --git a/test/check/etc/moby b/test/check/etc/linuxkit
similarity index 99%
rename from test/check/etc/moby
rename to test/check/etc/linuxkit
index bcb34ed49..17d4dfb92 100644
--- a/test/check/etc/moby
+++ b/test/check/etc/linuxkit
@@ -7,4 +7,3 @@
            \______ o           __/
              \    \         __/
               \____\_______/
-
diff --git a/test/test.yml b/test/test.yml
index 4cd21c41e..dcfa7f755 100644
--- a/test/test.yml
+++ b/test/test.yml
@@ -1,11 +1,11 @@
 kernel:
-  image: "mobylinux/kernel:4.9.x"
+  image: "linuxkit/kernel:4.9.x"
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
-  - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
-  - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
-  - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
+  - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
+  - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
+  - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: dhcpcd
     image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa"
@@ -19,7 +19,7 @@ onboot:
     net: host
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: check
-    image: "mobylinux/check:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f"
+    image: "linuxkit/check:43c4147dda4e02d066ef158cd81718dbff8c8bd0"
     pid: host
     capabilities:
      - CAP_SYS_BOOT

From 103b517ef6040f8cb4717264d18cc6b2bc11bdcc Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Fri, 14 Apr 2017 14:20:47 -0500
Subject: [PATCH 3/4] tests: Move dockerbench over to use the linuxkit org

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 test/docker-bench/Makefile              | 10 +++++-----
 test/docker-bench/test-docker-bench.yml | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/docker-bench/Makefile b/test/docker-bench/Makefile
index dc7aa2468..8388678d9 100644
--- a/test/docker-bench/Makefile
+++ b/test/docker-bench/Makefile
@@ -11,15 +11,15 @@ 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 mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/test/docker-bench/test-docker-bench.yml b/test/docker-bench/test-docker-bench.yml
index 62e13fe84..0bc8b60f7 100644
--- a/test/docker-bench/test-docker-bench.yml
+++ b/test/docker-bench/test-docker-bench.yml
@@ -1,11 +1,11 @@
 kernel:
-  image: "mobylinux/kernel:4.9.x"
+  image: "linuxkit/kernel:4.9.x"
   cmdline: "console=ttyS0 console=tty0 page_poison=1"
 init:
   - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
-  - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
-  - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
-  - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
+  - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
+  - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
+  - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: sysctl
     image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
@@ -16,21 +16,21 @@ onboot:
      - CAP_SYS_ADMIN
     readonly: true
   - name: sysfs
-    image: mobylinux/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c
+    image: "linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c"
   - name: binfmt
     image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692"
     binds:
      - /proc/sys/fs/binfmt_misc:/binfmt_misc
     readonly: true
   - name: format
-    image: "mobylinux/format:53748000acf515549d398e6ae68545c26c0f3a2e"
+    image: "linuxkit/format:53748000acf515549d398e6ae68545c26c0f3a2e"
     binds:
      - /dev:/dev
     capabilities:
      - CAP_SYS_ADMIN
      - CAP_MKNOD
   - name: mount
-    image: "mobylinux/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a"
+    image: "linuxkit/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a"
     binds:
      - /dev:/dev
      - /var:/var:rshared,rbind
@@ -40,13 +40,13 @@ onboot:
     command: ["/mount.sh", "/var/lib/docker"]
 services:
   - name: rngd
-    image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9"
+    image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314"
     capabilities:
      - CAP_SYS_ADMIN
     oomScoreAdj: -800
     readonly: true
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703"
+    image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp/etc:/etc
@@ -57,7 +57,7 @@ services:
     net: host
     oomScoreAdj: -800
   - name: docker
-    image: "mobylinux/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08"
+    image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08"
     capabilities:
      - all
     net: host
@@ -69,7 +69,7 @@ services:
      - /lib/modules:/lib/modules
      - /run:/var/run
   - name: test-docker-bench
-    image: "mobylinux/test-docker-bench:2f941429d874c5dcf05e38005affb4f10192e1a8"
+    image: "linuxkit/test-docker-bench:2f941429d874c5dcf05e38005affb4f10192e1a8"
     ipc: host
     pid: host
     net: host
@@ -79,6 +79,6 @@ services:
      - all
 trust:
   image:
-    - mobylinux/kernel
+    - linuxkit/kernel
 outputs:
   - format: kernel+initrd

From 2af774f2e915f9652d9d65fda70c23d556033fa3 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Fri, 14 Apr 2017 14:48:31 -0500
Subject: [PATCH 4/4] tests: Move ltp/poweroff over to the linuxkit org

Note, the jessie-slim image with the old sha256 does not exist anymore...

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 test/ltp/Dockerfile.pkg |  2 +-
 test/ltp/Makefile       | 10 +++++-----
 test/ltp/test-ltp.yml   | 12 ++++++------
 test/poweroff/Makefile  | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/ltp/Dockerfile.pkg b/test/ltp/Dockerfile.pkg
index f10eac135..a4118d9dd 100644
--- a/test/ltp/Dockerfile.pkg
+++ b/test/ltp/Dockerfile.pkg
@@ -1,4 +1,4 @@
-FROM debian:jessie-slim@sha256:2a14128195ab26b1c56c5773dda9def9b909c2e01596ef9108e2295d418210a3
+FROM debian:jessie-slim@sha256:fb22c1cef74071a6cd0145c1f91ca85ba9bd3f8b4d6db8560fe69eb36a175ca3
 ADD . /
 WORKDIR /opt/ltp
 ENTRYPOINT ["/bin/sh", "/check.sh"]
diff --git a/test/ltp/Makefile b/test/ltp/Makefile
index 20ad98a22..53fcbeab0 100644
--- a/test/ltp/Makefile
+++ b/test/ltp/Makefile
@@ -23,15 +23,15 @@ 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 mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml
index d85bd81a8..072c0f6e6 100644
--- a/test/ltp/test-ltp.yml
+++ b/test/ltp/test-ltp.yml
@@ -1,14 +1,14 @@
 kernel:
-  image: "mobylinux/kernel:4.9.x"
+  image: "linuxkit/kernel:4.9.x"
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
-  - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
-  - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
-  - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
+  - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
+  - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
+  - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: ltp
-    image: "mobylinux/test-ltp-20170116:d4722477c11e0006d6e5529efe241b6ae70ff3a9" 
+    image: "linuxkit/test-ltp-20170116:81229df2d25065b06f0a3071faaace8d66c87e67"
     net: host
     pid: host
     binds:
@@ -17,7 +17,7 @@ onboot:
      - all
 services:
   - name: poweroff
-    image: "mobylinux/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
+    image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084"
     pid: host
     capabilities:
       - CAP_SYS_BOOT
diff --git a/test/poweroff/Makefile b/test/poweroff/Makefile
index ec3b49d6e..9f254bf8d 100644
--- a/test/poweroff/Makefile
+++ b/test/poweroff/Makefile
@@ -11,15 +11,15 @@ 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 mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash