vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #516 from mheon/gitignore_update

Browse source 
Update gitignore to replace ocic with crioctl
This commit is contained in:
Mrunal Patel 2017-05-15 13:30:03 -07:00 committed by GitHub
commit 20e9aeb16f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -5,7 +5,7 @@
/docs/*.[158] /docs/*.[158]
/docs/*.[158].gz /docs/*.[158].gz
/kpod /kpod
/ocic /crioctl
/crio /crio
/crio.conf /crio.conf
*.o *.o

8
test/ctr.bats
View file

@ -558,18 +558,18 @@ function teardown() {
} }
@test "ctr caps drop" { @test "ctr caps drop" {
start_ocid start_crio
run ocic pod run --config "$TESTDATA"/sandbox_config.json run crioctl pod run --config "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" 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)') 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 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" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
cleanup_ctrs cleanup_ctrs
cleanup_pods cleanup_pods
stop_ocid stop_crio
} }