From 2004993b55508b531e9f0e8f1fa6f65092d3b1b0 Mon Sep 17 00:00:00 2001
From: utam0k <k0ma@utam0k.jp>
Date: Sun, 5 Jan 2025 14:10:38 +0900
Subject: [PATCH] Remove oci tests that are duplicates of contest

Signed-off-by: utam0k <k0ma@utam0k.jp>
---
 scripts/oci_integration_tests.sh | 47 +++++++++++++++++---------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/scripts/oci_integration_tests.sh b/scripts/oci_integration_tests.sh
index c96a110e6..ca1a93d3a 100755
--- a/scripts/oci_integration_tests.sh
+++ b/scripts/oci_integration_tests.sh
@@ -13,21 +13,11 @@ test_cases=(
   "delete/delete.t"
   "delete_only_create_resources/delete_only_create_resources.t"
   "delete_resources/delete_resources.t"
-  "hooks/hooks.t"
   "hooks_stdin/hooks_stdin.t"
-  "hostname/hostname.t"
   "kill/kill.t"
   "kill_no_effect/kill_no_effect.t"
   "killsig/killsig.t"
-  # This case includes checking for features that are excluded from linux kernel 5.0, so even runc doesn't pass it.
-  # ref. https://github.com/docker/cli/pull/2908
-  # "linux_cgroups_blkio/linux_cgroups_blkio.t"
-  "linux_cgroups_cpus/linux_cgroups_cpus.t"
   "linux_cgroups_devices/linux_cgroups_devices.t"
-  "linux_cgroups_hugetlb/linux_cgroups_hugetlb.t"
-  "linux_cgroups_memory/linux_cgroups_memory.t"
-  "linux_cgroups_network/linux_cgroups_network.t"
-  "linux_cgroups_pids/linux_cgroups_pids.t"
   # This case includes checking for features that are excluded from linux kernel 5.0, so even runc doesn't pass it.
   # ref. https://github.com/docker/cli/pull/2908
   # "linux_cgroups_relative_blkio/linux_cgroups_relative_blkio.t"
@@ -37,44 +27,57 @@ test_cases=(
   "linux_cgroups_relative_memory/linux_cgroups_relative_memory.t"
   "linux_cgroups_relative_network/linux_cgroups_relative_network.t"
   "linux_cgroups_relative_pids/linux_cgroups_relative_pids.t"
-  "linux_devices/linux_devices.t"
   "linux_masked_paths/linux_masked_paths.t"
   "linux_mount_label/linux_mount_label.t"
-  # This test case hangs on the Github Action. Runtime-tools has an issue filed from 2019 that the clean up step hangs. Otherwise, the test case passes.
-  # Ref: https://github.com/opencontainers/runtime-tools/issues/698
-  # "linux_ns_itype/linux_ns_itype.t"
   "linux_ns_nopath/linux_ns_nopath.t"
   "linux_ns_path/linux_ns_path.t"
   "linux_ns_path_type/linux_ns_path_type.t"
   # This test case requires that an apparmor profile named 'acme_secure_profile' has been installed on the system. It needs to allow the capabilities
   # validated by runtime-tools otherwise the test case will fail despite the profile being available.
   # "linux_process_apparmor_profile/linux_process_apparmor_profile.t"
-  "linux_readonly_paths/linux_readonly_paths.t"
   "linux_rootfs_propagation/linux_rootfs_propagation.t"
-  "linux_seccomp/linux_seccomp.t"
-  "linux_sysctl/linux_sysctl.t"
   "linux_uid_mappings/linux_uid_mappings.t"
   # "misc_props/misc_props.t" runc also fails this, check out https://github.com/containers/youki/pull/1347#issuecomment-1315332775
   "mounts/mounts.t"
-  # This test case passed on local box, but not on Github Action. `runc` also fails on Github Action, so likely it is an issue with the test.
-  # "pidfile/pidfile.t"
   "poststart/poststart.t"
   "poststart_fail/poststart_fail.t"
   "poststop/poststop.t"
   "poststop_fail/poststop_fail.t"
   "prestart/prestart.t"
   "prestart_fail/prestart_fail.t"
-  "process/process.t"
   "process_capabilities/process_capabilities.t"
   "process_capabilities_fail/process_capabilities_fail.t"
   "process_oom_score_adj/process_oom_score_adj.t"
-  "process_rlimits/process_rlimits.t"
   "process_rlimits_fail/process_rlimits_fail.t"
-  "process_user/process_user.t"
   "root_readonly_true/root_readonly_true.t"
   # Record the tests that runc also fails to pass below, maybe we will fix this by origin integration test, issue: https://github.com/containers/youki/issues/56
   # "start/start.t"
   "state/state.t"
+
+  # The below tests have already been implemented in our integration tests, `contest`.
+  # "hooks/hooks.t"
+  # "hostname/hostname.t"
+  # # This case includes checking for features that are excluded from linux kernel 5.0, so even runc doesn't pass it.
+  # # ref. https://github.com/docker/cli/pull/2908
+  # # "linux_cgroups_blkio/linux_cgroups_blkio.t"
+  # "linux_cgroups_cpus/linux_cgroups_cpus.t"
+  # "linux_cgroups_hugetlb/linux_cgroups_hugetlb.t"
+  # "linux_cgroups_memory/linux_cgroups_memory.t"
+  # "linux_cgroups_network/linux_cgroups_network.t"
+  # "linux_cgroups_pids/linux_cgroups_pids.t"
+  # "linux_devices/linux_devices.t"
+  # # This test case hangs on the Github Action. Runtime-tools has an issue filed from 2019 that the clean up step hangs. Otherwise, the test case passes.
+  # # Ref: https://github.com/opencontainers/runtime-tools/issues/698
+  # # "linux_ns_itype/linux_ns_itype.t"
+  # "linux_readonly_paths/linux_readonly_paths.t"
+  # "linux_seccomp/linux_seccomp.t"
+  # "linux_sysctl/linux_sysctl.t"
+  # # This test case passed on local box, but not on Github Action. `runc` also fails on Github Action, so likely it is an issue with the test.
+  # # "pidfile/pidfile.t"
+  # "process/process.t"
+  # "process_rlimits/process_rlimits.t"
+  # "process_user/process_user.t"
+  '
 )
 
 check_environment() {