Skip to content

feat(runtime): preserve init exit status through wait #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZhiXiao-Lin wants to merge 1 commit into
base: feat/pidfd-signaling
Choose a base branch
from
Open

feat(runtime): preserve init exit status through wait #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions .github/scripts/native-linux-smoke.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,33 @@ run_smoke() {
printf '%s\n' "$output"
jq --exit-status \
--argjson expected "$expected_kvm_present" \
'.status == "available" and .kvm_device_present == $expected' \
'.schema_version == "a3s.oci.native-linux-smoke.v2"
and .platform == "linux" and .status == "available"
and .kvm_device_present == $expected
and .bundle_loaded
and .service_operations
== ["features", "create", "state", "start", "kill", "delete", "wait"]
and .dedicated_vm_rejected_before_create
and .create_returned_created
and .create_replayed
and (.created_pid > 0)
and .marker_absent_after_create
and .start_released
and .running_observed
and .kill_delivered
and .kill_replayed
and .wait_timeout_enforced
and .wait_exit_status == {"signal": 9, "oom_killed": false}
and .wait_replayed
and .stopped_observed
and .marker_verified
and .delete_succeeded
and .delete_replayed
and .state_missing_after_delete
and .marker_removed
and .executor_runtime_clean
and .session_root_clean
and (.reason == null)' \
<<<"$output" >/dev/null
}

Expand All @@ -59,12 +85,12 @@ run_multi_container_smoke() {
printf '%s\n' "$output"
jq --exit-status \
--argjson expected "$expected_kvm_present" \
'.schema_version == "a3s.oci.native-linux-multi-container-smoke.v1"
'.schema_version == "a3s.oci.native-linux-multi-container-smoke.v2"
and .platform == "linux" and .status == "available"
and .kvm_device_present == $expected
and .bundles_loaded
and .service_operations
== ["features", "create", "state", "start", "kill", "delete"]
== ["features", "create", "state", "start", "kill", "delete", "wait"]
and .lifecycle.distinct_bundle_directories
and .lifecycle.distinct_rootfs_directories
and .lifecycle.both_created_before_start
Expand All @@ -80,8 +106,11 @@ run_multi_container_smoke() {
and .lifecycle.marker_a_verified
and .lifecycle.b_unchanged_after_a_start
and .lifecycle.marker_b_absent_after_a_start
and .lifecycle.wait_a_did_not_block_b
and .lifecycle.kill_a_replayed
and .lifecycle.a_stopped
and .lifecycle.wait_status_a == {"signal": 9, "oom_killed": false}
and .lifecycle.wait_a_replayed
and .lifecycle.b_unchanged_after_a_kill
and .lifecycle.marker_b_absent_after_a_kill
and .lifecycle.delete_a_replayed
Expand All @@ -98,6 +127,8 @@ run_multi_container_smoke() {
and .lifecycle.marker_b_verified
and .lifecycle.kill_b_replayed
and .lifecycle.b_stopped
and .lifecycle.wait_status_b == {"signal": 9, "oom_killed": false}
and .lifecycle.wait_b_replayed
and .lifecycle.delete_b_replayed
and .lifecycle.b_missing_after_delete
and .markers_removed
Expand All @@ -121,11 +152,11 @@ run_fault_cleanup() {
--fault-after "$phase")"
printf '%s\n' "$output"
jq --exit-status --arg phase "$phase" \
'.schema_version == "a3s.oci.native-linux-fault-cleanup.v1"
'.schema_version == "a3s.oci.native-linux-fault-cleanup.v2"
and .platform == "linux" and .status == "available"
and .bundle_loaded
and .service_operations
== ["features", "create", "state", "start", "kill", "delete"]
== ["features", "create", "state", "start", "kill", "delete", "wait"]
and .lifecycle.requested_fault == $phase
and .lifecycle.injected_fault == $phase
and .lifecycle.create_completed
Expand Down
45 changes: 30 additions & 15 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,19 +226,19 @@ jobs:
if [[ "$support" == "1" ]]; then
test "$status" -eq 0
jq --exit-status --arg agent_version "$agent_version" \
'.schema_version == "a3s.oci.agent-vm-smoke.v3"
'.schema_version == "a3s.oci.agent-vm-smoke.v4"
and .platform == "macos" and .status == "available"
and .endpoint_bound and .shim_spawned
and (.endpoint_name | startswith("a3s-oci-agent-"))
and (.shim_process_id > 0)
and (.bridge_process_id > 0)
and (.bridge_process_id != .shim_process_id)
and .shim_client_verified and .protocol_negotiated
and .selected_protocol == 1
and .selected_protocol == 2
and .agent_version == $agent_version
and .guest_architecture == "aarch64"
and .advertised_operations
== ["create", "state", "start", "kill", "delete"]
== ["create", "state", "start", "kill", "delete", "wait"]
and .shim_report_verified and .shim_exit_code == 0
and .console_created
and .shim_report.platform == "macos"
Expand All @@ -256,7 +256,7 @@ jobs:
else
test "$status" -eq 2
jq --exit-status \
'.schema_version == "a3s.oci.agent-vm-smoke.v3"
'.schema_version == "a3s.oci.agent-vm-smoke.v4"
and .platform == "macos" and .status == "unavailable"
and (.endpoint_name | startswith("a3s-oci-agent-"))
and (.protocol_negotiated | not)
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
printf '%s\n' "$unsigned_output"
test "$unsigned_status" -eq 2
jq --exit-status \
'.schema_version == "a3s.oci.agent-vm-smoke.v3"
'.schema_version == "a3s.oci.agent-vm-smoke.v4"
and .platform == "macos" and .status == "unavailable"
and .endpoint_bound and .shim_spawned
and (.endpoint_name | startswith("a3s-oci-agent-"))
Expand Down Expand Up @@ -346,14 +346,18 @@ jobs:
if [[ "$support" == "1" ]]; then
test "$status" -eq 0
jq --exit-status \
'.schema_version == "a3s.oci.oci-vm-smoke.v3"
'.schema_version == "a3s.oci.oci-vm-smoke.v4"
and .platform == "macos" and .status == "available"
and .bundle_loaded
and .create_returned_created and .create_replayed
and (.created_pid > 0)
and .marker_absent_after_create
and .start_released and .running_observed
and .kill_delivered and .kill_replayed
and .wait_timeout_enforced
and .wait_exit_status
== {"exit_code": 0, "oom_killed": false}
and .wait_replayed
and .stopped_observed and .marker_verified
and .delete_succeeded and .delete_replayed
and .state_missing_after_delete
Expand All @@ -369,10 +373,10 @@ jobs:
!= .bridge.shim_process_id)
and .bridge.shim_client_verified
and .bridge.protocol_negotiated
and .bridge.selected_protocol == 1
and .bridge.selected_protocol == 2
and .bridge.guest_architecture == "aarch64"
and .bridge.advertised_operations
== ["create", "state", "start", "kill", "delete"]
== ["create", "state", "start", "kill", "delete", "wait"]
and .bridge.shim_report_verified
and .bridge.shim_exit_code == 0
and .bridge.console_created
Expand All @@ -388,7 +392,7 @@ jobs:
else
test "$status" -eq 2
jq --exit-status \
'.schema_version == "a3s.oci.oci-vm-smoke.v3"
'.schema_version == "a3s.oci.oci-vm-smoke.v4"
and .platform == "macos" and .status == "unavailable"
and .bundle_loaded
and .bridge.platform == "macos"
Expand Down Expand Up @@ -421,7 +425,7 @@ jobs:
printf '%s\n' "$unsigned_output"
test "$unsigned_status" -eq 2
jq --exit-status \
'.schema_version == "a3s.oci.oci-vm-smoke.v3"
'.schema_version == "a3s.oci.oci-vm-smoke.v4"
and .platform == "macos" and .status == "unavailable"
and .bundle_loaded
and (.create_returned_created | not)
Expand Down Expand Up @@ -490,7 +494,7 @@ jobs:
if [[ "$support" == "1" ]]; then
test "$status" -eq 0
jq --exit-status \
'.schema_version == "a3s.oci.oci-vm-multi-container-smoke.v1"
'.schema_version == "a3s.oci.oci-vm-multi-container-smoke.v2"
and .platform == "macos" and .status == "available"
and .bundles_loaded
and .lifecycle.distinct_bundle_directories
Expand All @@ -508,8 +512,12 @@ jobs:
and .lifecycle.marker_a_verified
and .lifecycle.b_unchanged_after_a_start
and .lifecycle.marker_b_absent_after_a_start
and .lifecycle.wait_a_did_not_block_b
and .lifecycle.kill_a_replayed
and .lifecycle.a_stopped
and .lifecycle.wait_status_a
== {"exit_code": 0, "oom_killed": false}
and .lifecycle.wait_a_replayed
and .lifecycle.b_unchanged_after_a_kill
and .lifecycle.marker_b_absent_after_a_kill
and .lifecycle.delete_a_replayed
Expand All @@ -526,14 +534,18 @@ jobs:
and .lifecycle.marker_b_verified
and .lifecycle.kill_b_replayed
and .lifecycle.b_stopped
and .lifecycle.wait_status_b
== {"exit_code": 0, "oom_killed": false}
and .lifecycle.wait_b_replayed
and .lifecycle.delete_b_replayed
and .lifecycle.b_missing_after_delete
and .markers_removed and .guest_runtime_clean
and .bridge.platform == "macos"
and .bridge.status == "available"
and .bridge.protocol_negotiated
and .bridge.selected_protocol == 2
and .bridge.advertised_operations
== ["create", "state", "start", "kill", "delete"]
== ["create", "state", "start", "kill", "delete", "wait"]
and .bridge.shim_report_verified
and .bridge.shim_exit_code == 0
and .bridge.macos_cleanup.endpoint_removed
Expand All @@ -549,7 +561,7 @@ jobs:
else
test "$status" -eq 2
jq --exit-status \
'.schema_version == "a3s.oci.oci-vm-multi-container-smoke.v1"
'.schema_version == "a3s.oci.oci-vm-multi-container-smoke.v2"
and .platform == "macos" and .status == "unavailable"
and .bundles_loaded
and .bridge.platform == "macos"
Expand Down Expand Up @@ -615,7 +627,7 @@ jobs:
if [[ "$support" == "1" ]]; then
test "$status" -eq 0
jq --exit-status --arg phase "$phase" \
'.schema_version == "a3s.oci.oci-vm-fault-cleanup.v1"
'.schema_version == "a3s.oci.oci-vm-fault-cleanup.v2"
and .platform == "macos" and .status == "available"
and .bundle_loaded
and .lifecycle.requested_fault == $phase
Expand All @@ -640,6 +652,9 @@ jobs:
and .marker_removed and .guest_runtime_clean
and .bridge.status == "available"
and .bridge.protocol_negotiated
and .bridge.selected_protocol == 2
and .bridge.advertised_operations
== ["create", "state", "start", "kill", "delete", "wait"]
and .bridge.shim_report_verified
and .bridge.shim_exit_code == 0
and .bridge.macos_cleanup.endpoint_removed
Expand All @@ -655,7 +670,7 @@ jobs:
else
test "$status" -eq 2
jq --exit-status --arg phase "$phase" \
'.schema_version == "a3s.oci.oci-vm-fault-cleanup.v1"
'.schema_version == "a3s.oci.oci-vm-fault-cleanup.v2"
and .platform == "macos" and .status == "unavailable"
and .bundle_loaded
and .lifecycle.requested_fault == $phase
Expand Down
Loading
Loading