From 5b184aad278cf801444bd939327e10f055ee4547 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 15 May 2017 14:46:42 -0400 Subject: [PATCH 1/2] Update gitignore to replace ocic with crioctl Matches the rename that just got merged Signed-off-by: Matthew Heon --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9ab61ede..a244b597 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ /docs/*.[158] /docs/*.[158].gz /kpod -/ocic +/crioctl /crio /crio.conf *.o From d60d3b78adda3fd764516f01683321e27a6b99a1 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 15 May 2017 16:03:05 -0400 Subject: [PATCH 2/2] Fix unit test to use crio/crioctl The rename to crio missed this test, update it so tests pass Signed-off-by: Matthew Heon --- test/ctr.bats | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ctr.bats b/test/ctr.bats index 8b2febc2..703a58a1 100644 --- a/test/ctr.bats +++ b/test/ctr.bats @@ -558,18 +558,18 @@ function teardown() { } @test "ctr caps drop" { - start_ocid - run ocic pod run --config "$TESTDATA"/sandbox_config.json + start_crio + run crioctl pod run --config "$TESTDATA"/sandbox_config.json echo "$output" [ "$status" -eq 0 ] pod_id="$output" capsconfig=$(cat "$TESTDATA"/container_config.json | python -c 'import json,sys;obj=json.load(sys.stdin);obj["linux"]["security_context"]["capabilities"] = {u"add_capabilities": [], u"drop_capabilities": [u"mknod", u"kill", u"sys_chroot", u"setuid", u"setgid"]}; json.dump(obj, sys.stdout)') echo "$capsconfig" > "$TESTDIR"/container_config_caps.json - run ocic ctr create --config "$TESTDIR"/container_config_caps.json --pod "$pod_id" + run crioctl ctr create --config "$TESTDIR"/container_config_caps.json --pod "$pod_id" echo "$output" [ "$status" -eq 0 ] cleanup_ctrs cleanup_pods - stop_ocid + stop_crio }