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

Merge pull request #1156 from weiwei04/replace_crioctl_with_crictl

Browse source 
replace crioctl with crictl in e2e
This commit is contained in:
Mrunal Patel 2017-11-15 09:38:21 -10:00 committed by GitHub
commit 7b837b5a1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 239 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

175
test/pod.bats
View file

@ -9,24 +9,24 @@ function teardown() {
# PR#59 # PR#59
@test "pod release name on remove" { @test "pod release name on remove" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
id="$output" id="$output"
run crioctl pod stop --id "$id" run crictl stops "$id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$id" run crictl rms "$id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
id="$output" id="$output"
run crioctl pod stop --id "$id" run crictl stops "$id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$id" run crictl rms "$id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
cleanup_ctrs cleanup_ctrs
@ -36,21 +36,21 @@ function teardown() {
@test "pod remove" { @test "pod remove" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
run crioctl ctr create --config "$TESTDATA"/container_redis.json --pod "$pod_id" run crictl create "$pod_id" "$TESTDATA"/container_redis.json "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
ctr_id="$output" ctr_id="$output"
run crioctl ctr start --id "$ctr_id" run crictl start "$ctr_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod stop --id "$pod_id" run crictl stops "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$pod_id" run crictl rms "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
cleanup_ctrs cleanup_ctrs
@ -61,18 +61,18 @@ function teardown() {
@test "pod stop ignores not found sandboxes" { @test "pod stop ignores not found sandboxes" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
run crioctl pod stop --id "$pod_id" run crictl stops "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$pod_id" run crictl rms "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod stop --id "$pod_id" run crictl stops "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -83,96 +83,90 @@ function teardown() {
@test "pod list filtering" { @test "pod list filtering" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json -name pod1 --label "a=b" --label "c=d" --label "e=f" run crictl runs "$TESTDATA"/sandbox1_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod1_id="$output" pod1_id="$output"
run crioctl pod run --config "$TESTDATA"/sandbox_config.json -name pod2 --label "a=b" --label "c=d" run crictl runs "$TESTDATA"/sandbox2_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod2_id="$output" pod2_id="$output"
run crioctl pod run --config "$TESTDATA"/sandbox_config.json -name pod3 --label "a=b" run crictl runs "$TESTDATA"/sandbox3_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod3_id="$output" pod3_id="$output"
run crioctl pod list --label "a=b" --label "c=d" --label "e=f" --quiet run crictl sandboxes --label "name=podsandbox3" --quiet
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" != "" ]] #[[ "$output" != "" ]]
[[ "$output" =~ "$pod1_id" ]] [[ "$output" == "$pod3_id" ]]
run crioctl pod list --label "g=h" --quiet run crictl sandboxes --label "label=not-exist" --quiet
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" == "" ]] [[ "$output" == "" ]]
run crioctl pod list --label "a=b" --label "c=d" --quiet run crictl sandboxes --label "group=test" --label "version=v1.0.0" --quiet
echo "$output"
[ "$status" -eq 0 ]
[[ "$output" != "" ]]
[[ "$output" =~ "$pod1_id" ]]
[[ "$output" =~ "$pod2_id" ]]
run crioctl pod list --label "a=b" --quiet
echo "$output"
[ "$status" -eq 0 ]
[[ "$output" != "" ]]
[[ "$output" =~ "$pod1_id" ]]
[[ "$output" =~ "$pod2_id" ]]
[[ "$output" =~ "$pod3_id" ]]
run crioctl pod list --id "$pod1_id"
echo "$output"
[ "$status" -eq 0 ]
[[ "$output" != "" ]]
[[ "$output" =~ "$pod1_id" ]]
# filter by truncated id should work as well
run crioctl pod list --id "${pod1_id:0:4}"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" != "" ]] [[ "$output" != "" ]]
[[ "$output" =~ "$pod1_id" ]] [[ "$output" =~ "$pod1_id" ]]
run crioctl pod list --id "$pod2_id" [[ "$output" =~ "$pod2_id" ]]
[[ "$output" != "$pod3_id" ]]
run crictl sandboxes --label "group=test" --quiet
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" != "" ]] [[ "$output" != "" ]]
[[ "$output" =~ "$pod2_id" ]] [[ "$output" =~ "$pod1_id" ]]
run crioctl pod list --id "$pod3_id" [[ "$output" =~ "$pod2_id" ]]
[[ "$output" =~ "$pod3_id" ]]
run crictl sandboxes --id "$pod1_id" --quiet
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" != "" ]] [[ "$output" == "$pod1_id" ]]
[[ "$output" =~ "$pod3_id" ]] # filter by truncated id should work as well
run crioctl pod list --id "$pod1_id" --label "a=b" run crictl sandboxes --id "${pod1_id:0:4}" --quiet
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" != "" ]] [[ "$output" == "$pod1_id" ]]
[[ "$output" =~ "$pod1_id" ]] run crictl sandboxes --id "$pod2_id" --quiet
run crioctl pod list --id "$pod2_id" --label "a=b"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" != "" ]] [[ "$output" == "$pod2_id" ]]
[[ "$output" =~ "$pod2_id" ]] run crictl sandboxes --id "$pod3_id" --quiet
run crioctl pod list --id "$pod3_id" --label "a=b"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" != "" ]] [[ "$output" == "$pod3_id" ]]
[[ "$output" =~ "$pod3_id" ]] run crictl sandboxes --id "$pod1_id" --label "group=test" --quiet
run crioctl pod list --id "$pod3_id" --label "c=d" echo "$output"
[ "$status" -eq 0 ]
[[ "$output" == "$pod1_id" ]]
run crictl sandboxes --id "$pod2_id" --label "group=test" --quiet
echo "$output"
[ "$status" -eq 0 ]
[[ "$output" == "$pod2_id" ]]
run crictl sandboxes --id "$pod3_id" --label "group=test" --quiet
echo "$output"
[ "$status" -eq 0 ]
[[ "$output" == "$pod3_id" ]]
run crictl sandboxes --id "$pod3_id" --label "group=production" --quiet
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" == "" ]] [[ "$output" == "" ]]
run crioctl pod stop --id "$pod1_id" run crictl stops "$pod1_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$pod1_id" run crictl rms "$pod1_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod stop --id "$pod2_id" run crictl stops "$pod2_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$pod2_id" run crictl rms "$pod2_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod stop --id "$pod3_id" run crictl stops "$pod3_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$pod3_id" run crictl rms "$pod3_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
cleanup_pods cleanup_pods
@ -181,12 +175,12 @@ function teardown() {
@test "pod metadata in list & status" { @test "pod metadata in list & status" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
run crioctl pod list --id "$pod_id" run crictl sandboxes --id "$pod_id" --verbose
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
# TODO: expected value should not hard coded here # TODO: expected value should not hard coded here
@ -195,7 +189,7 @@ function teardown() {
[[ "$output" =~ "Namespace: redhat.test.crio" ]] [[ "$output" =~ "Namespace: redhat.test.crio" ]]
[[ "$output" =~ "Attempt: 1" ]] [[ "$output" =~ "Attempt: 1" ]]
run crioctl pod status --id "$pod_id" run crictl inspects "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
# TODO: expected value should not hard coded here # TODO: expected value should not hard coded here
@ -210,31 +204,31 @@ function teardown() {
@test "pass pod sysctls to runtime" { @test "pass pod sysctls to runtime" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config_sysctl.json run crictl runs "$TESTDATA"/sandbox_config_sysctl.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
run crioctl ctr create --pod "$pod_id" --config "$TESTDATA"/container_redis.json run crictl create "$pod_id" "$TESTDATA"/container_redis.json "$TESTDATA"/sandbox_config_sysctl.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
container_id="$output" ctr_id="$output"
run crioctl ctr start --id "$container_id" run crictl start "$ctr_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl ctr execsync --id "$container_id" sysctl kernel.shm_rmid_forced run crictl exec --sync "$ctr_id" sysctl kernel.shm_rmid_forced
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" =~ "kernel.shm_rmid_forced = 1" ]] [[ "$output" =~ "kernel.shm_rmid_forced = 1" ]]
run crioctl ctr execsync --id "$container_id" sysctl kernel.msgmax run crictl exec --sync "$ctr_id" sysctl kernel.msgmax
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" =~ "kernel.msgmax = 8192" ]] [[ "$output" =~ "kernel.msgmax = 8192" ]]
run crioctl ctr execsync --id "$container_id" sysctl net.ipv4.ip_local_port_range run crictl exec --sync "$ctr_id" sysctl net.ipv4.ip_local_port_range
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "$output" =~ "net.ipv4.ip_local_port_range = 1024 65000" ]] [[ "$output" =~ "net.ipv4.ip_local_port_range = 1024 65000" ]]
@ -245,14 +239,14 @@ function teardown() {
@test "pod stop idempotent" { @test "pod stop idempotent" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
run crioctl pod stop --id "$pod_id" run crictl stops "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod stop --id "$pod_id" run crictl stops "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -263,17 +257,17 @@ function teardown() {
@test "pod remove idempotent" { @test "pod remove idempotent" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
run crioctl pod stop --id "$pod_id" run crictl stops "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$pod_id" run crictl rms "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod remove --id "$pod_id" run crictl rms "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -284,18 +278,21 @@ function teardown() {
@test "pod stop idempotent with ctrs already stopped" { @test "pod stop idempotent with ctrs already stopped" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id" run crictl create "$pod_id" "$TESTDATA"/container_config.json "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
ctr_id="$output" ctr_id="$output"
run crioctl ctr start --id "$ctr_id" run crictl start "$ctr_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run crioctl pod stop --id "$pod_id" run crictl stop "$ctr_id"
echo "$output"
[ "$status" -eq 0 ]
run crictl stops "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -306,16 +303,16 @@ function teardown() {
@test "restart crio and still get pod status" { @test "restart crio and still get pod status" {
start_crio start_crio
run crioctl pod run --config "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"
run crioctl pod stop --id "$pod_id" run crictl stops "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
restart_crio restart_crio
run crioctl pod status --id "$pod_id" run crictl inspects "$pod_id"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[ "$output" != "" ] [ "$output" != "" ]
@ -334,7 +331,7 @@ function teardown() {
echo "$wrong_cgroup_parent_config" > "$TESTDIR"/sandbox_wrong_cgroup_parent.json echo "$wrong_cgroup_parent_config" > "$TESTDIR"/sandbox_wrong_cgroup_parent.json
start_crio start_crio
run crioctl pod run --config "$TESTDIR"/sandbox_wrong_cgroup_parent.json run crictl runs "$TESTDIR"/sandbox_wrong_cgroup_parent.json
echo "$output" echo "$output"
[ "$status" -eq 1 ] [ "$status" -eq 1 ]
@ -350,7 +347,7 @@ function teardown() {
echo "$cgroup_parent_config" > "$TESTDIR"/sandbox_systemd_cgroup_parent.json echo "$cgroup_parent_config" > "$TESTDIR"/sandbox_systemd_cgroup_parent.json
start_crio start_crio
run crioctl pod run --config "$TESTDIR"/sandbox_systemd_cgroup_parent.json run crictl runs "$TESTDIR"/sandbox_systemd_cgroup_parent.json
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
pod_id="$output" pod_id="$output"

51
test/testdata/sandbox1_config.json vendored Normal file
View file

@ -0,0 +1,51 @@
{
"metadata": {
"name": "podsandbox1",
"uid": "redhat-test-crio-1",
"namespace": "redhat.test.crio",
"attempt": 1
},
"hostname": "crioctl_host",
"log_directory": "",
"dns_config": {
"searches": [
"8.8.8.8"
]
},
"port_mappings": [],
"resources": {
"cpu": {
"limits": 3,
"requests": 2
},
"memory": {
"limits": 50000000,
"requests": 2000000
}
},
"labels": {
"name": "podsandbox1",
"group": "test",
"version": "v1.0.0"
},
"annotations": {
"owner": "hmeng",
"security.alpha.kubernetes.io/seccomp/pod": "unconfined"
},
"linux": {
"cgroup_parent": "/Burstable/pod_123-456",
"security_context": {
"namespace_options": {
"host_network": false,
"host_pid": false,
"host_ipc": false
},
"selinux_options": {
"user": "system_u",
"role": "system_r",
"type": "svirt_lxc_net_t",
"level": "s0:c4,c5"
}
}
}
}

51
test/testdata/sandbox2_config.json vendored Normal file
View file

@ -0,0 +1,51 @@
{
"metadata": {
"name": "podsandbox2",
"uid": "redhat-test-crio-2",
"namespace": "redhat.test.crio",
"attempt": 1
},
"hostname": "crioctl_host",
"log_directory": "",
"dns_config": {
"searches": [
"8.8.8.8"
]
},
"port_mappings": [],
"resources": {
"cpu": {
"limits": 3,
"requests": 2
},
"memory": {
"limits": 50000000,
"requests": 2000000
}
},
"labels": {
"name": "podsandbox2",
"group": "test",
"version": "v1.0.0"
},
"annotations": {
"owner": "hmeng",
"security.alpha.kubernetes.io/seccomp/pod": "unconfined"
},
"linux": {
"cgroup_parent": "/Burstable/pod_123-456",
"security_context": {
"namespace_options": {
"host_network": false,
"host_pid": false,
"host_ipc": false
},
"selinux_options": {
"user": "system_u",
"role": "system_r",
"type": "svirt_lxc_net_t",
"level": "s0:c4,c5"
}
}
}
}

51
test/testdata/sandbox3_config.json vendored Normal file
View file

@ -0,0 +1,51 @@
{
"metadata": {
"name": "podsandbox3",
"uid": "redhat-test-crio-3",
"namespace": "redhat.test.crio",
"attempt": 1
},
"hostname": "crioctl_host",
"log_directory": "",
"dns_config": {
"searches": [
"8.8.8.8"
]
},
"port_mappings": [],
"resources": {
"cpu": {
"limits": 3,
"requests": 2
},
"memory": {
"limits": 50000000,
"requests": 2000000
}
},
"labels": {
"name": "podsandbox3",
"group": "test",
"version": "v1.1.0"
},
"annotations": {
"owner": "hmeng",
"security.alpha.kubernetes.io/seccomp/pod": "unconfined"
},
"linux": {
"cgroup_parent": "/Burstable/pod_123-456",
"security_context": {
"namespace_options": {
"host_network": false,
"host_pid": false,
"host_ipc": false
},
"selinux_options": {
"user": "system_u",
"role": "system_r",
"type": "svirt_lxc_net_t",
"level": "s0:c4,c5"
}
}
}
}