Merge pull request #702 from teawater/ci-fix

hack/test-cmd.sh: change test image from "busybox" to "hyperhq/busybox"

Author: bergwolf

hack/lib/test.sh

@@ -28,14 +28,14 @@ hyper::test::remove_image() {
 
 hyper::test::exitcode() {
   echo "Pod exit code test"
-  res=$(sudo hyperctl run --rm busybox sh -c "exit 17" > /dev/null 2>&1 ; echo $?)
+  res=$(sudo hyperctl run --rm hyperhq/busybox sh -c "exit 17" > /dev/null 2>&1 ; echo $?)
   echo "should return 17, return: $res"
   test $res -eq 17
 }
 
 hyper::test::exec() {
   echo "Pod exec and exit code test"
-  id=$(sudo hyperctl run -d busybox /bin/sh | sed -ne "s/POD id is \(.*\)/\1/p")
+  id=$(sudo hyperctl run -d hyperhq/busybox /bin/sh | sed -ne "s/POD id is \(.*\)/\1/p")
   echo "test pod ID is $id"
   res=$(sudo hyperctl exec $id sh -c "exit 37" > /dev/null 2>&1 ; echo $?)
   echo "should return 37, return: $res"
@@ -147,7 +147,7 @@ hyper::test::integration() {
 
 hyper::test::execvm() {
   echo "Pod execvm echo test"
-  id=$(sudo hyperctl run -d busybox /bin/sh | sed -ne "s/POD id is \(.*\)/\1/p")
+  id=$(sudo hyperctl run -d hyperhq/busybox /bin/sh | sed -ne "s/POD id is \(.*\)/\1/p")
   echo "test pod ID is $id"
   res=$(sudo hyperctl exec -m $id /sbin/busybox sh -c "echo aaa")
   echo "should return aaa, actual: $res"
@@ -221,7 +221,7 @@ hyper::test::force_kill_container() {
 # regression test for #577
 hyper::test::container_logs_no_newline() {
   echo "Container logs without newlines"
-  id=$(sudo hyperctl run -d busybox echo -n foobar | sed -ne "s/POD id is \(.*\)/\1/p")
+  id=$(sudo hyperctl run -d hyperhq/busybox echo -n foobar | sed -ne "s/POD id is \(.*\)/\1/p")
   sleep 3 # sleep a bit to let logger kick in
   res=$(sudo hyperctl logs $id)
   sudo hyperctl rm $id
@@ -262,5 +262,5 @@ END
     else
       return 1
     fi
-  done < <(sudo hyperctl run -t --rm --publish 3000:1300 busybox:latest sh -c 'echo "start" ; nc -l -p 1300')
+  done < <(sudo hyperctl run -t --rm --publish 3000:1300 hyperhq/busybox:latest sh -c 'echo "start" ; nc -l -p 1300')
 }

hack/pods/busybox-tty.pod

@@ -2,7 +2,7 @@
         "id": "test-container-force-killing",
         "containers" : [{
             "name": "busybox-with-tty",
-            "image": "busybox",
+            "image": "hyperhq/busybox",
             "command": ["/bin/sh"]
         }],
         "resource": {

hack/pods/file-mapping.pod

@@ -2,7 +2,7 @@
         "id": "test-file-mapping",
         "containers" : [{
             "name": "mapping",
-            "image": "busybox",
+            "image": "hyperhq/busybox",
             "command": ["/bin/sh", "-c", "md5sum /root/resolv.conf"],
             "volumes": [{
                 "volume": "resolv.conf",

hack/pods/hostname-err-char.pod

@@ -3,7 +3,7 @@
 	"hostname": "/myname",
 	"containers" : [{
 	    "name": "file-tester",
-	    "image": "busybox:latest",
+	    "image": "hyperhq/busybox:latest",
 	    "workdir": "/",
 	    "command": ["hostname"]
 	}],

hack/pods/hostname-err-long.pod

@@ -3,7 +3,7 @@
 	"hostname": "nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn",
 	"containers" : [{
 	    "name": "file-tester",
-	    "image": "busybox:latest",
+	    "image": "hyperhq/busybox:latest",
 	    "workdir": "/",
 	    "command": ["hostname"]
 	}],

hack/pods/hostname.pod

@@ -3,7 +3,7 @@
 	"hostname": "myname",
 	"containers" : [{
 	    "name": "file-tester",
-	    "image": "busybox:latest",
+	    "image": "hyperhq/busybox:latest",
 	    "workdir": "/",
 	    "command": ["hostname"]
 	}],

hack/pods/insert-file.pod

@@ -2,7 +2,7 @@
 	"id": "test-inject-file",
 	"containers" : [{
 	    "name": "file-tester",
-	    "image": "busybox:latest",
+	    "image": "hyperhq/busybox:latest",
 	    "workdir": "/",
 	    "command": ["/bin/sh", "-c", "cd /root/test/; md5sum resolv.conf logo.png t1 t2 t3"],
 		"files": [{

hack/pods/nfs-client.pod

@@ -4,7 +4,7 @@
     "memory": 256
   },
   "containers": [{
-      "image": "busybox",
+      "image": "hyperhq/busybox",
       "volumes": [{
 	"volume": "sharevolume",
 	"path": "/export",

hack/pods/readonly-rootfs.pod

@@ -1,7 +1,7 @@
 {
         "containers" : [{
             "name": "busybox-readonly",
-            "image": "busybox",
+            "image": "hyperhq/busybox",
             "command": ["/bin/sh"],
             "readonly": true,
             "volumes": [{

hack/pods/service.pod

@@ -1,7 +1,7 @@
 {
             "containers": [
                 {
-                    "image": "busybox:latest",
+                    "image": "hyperhq/busybox:latest",
                     "name": "service",
                     "command": ["/bin/sh", "-c", "ps aux"]
                 }