Name the test tools contest

Signed-off-by: utam0k <k0ma@utam0k.jp>

.github/workflows/e2e.yaml

@@ -123,10 +123,8 @@ jobs:
           name: youki
       - name: Add the permission to run
         run: chmod +x ./youki
-      - name: Build
-        run: just runtimetest rust-oci-tests-bin
       - name: Validate tests on youki
-        run: just rust-oci-tests
+        run: just run-contest
 
   rootless-podman-test:
     runs-on: ubuntu-22.04

.gitignore

@@ -2,7 +2,7 @@
 .idea/
 
 **/target
-/runtimetest-target
+/contest-target
 /bin
 .vagrant/
 
@@ -11,7 +11,7 @@ tags.lock
 tags.temp
 
 /youki
-/integration_test
+/contest
 /runtimetest
 
 .vscode
@@ -21,4 +21,4 @@ tags.temp
 /bundle.tar.gz
 /test.log
 
-/tests/k8s/_out/
+/e2e/k8s/_out/

.gitmodules

@@ -1,5 +1,3 @@
-[submodule "integration_tests/oci-runtime-tests"]
-	path = tests/oci-runtime-tests/src/github.com/opencontainers/runtime-tools
-	url = https://github.com/opencontainers/runtime-tools.git
-	ignore = dirty
-
+[submodule "e2e/oci-runtime-tests/src/github.com/opencontainers/runtime-tools"]
+	path = e2e/oci-runtime-tests/src/github.com/opencontainers/runtime-tools
+	url = ttps://github.com/opencontainers/runtime-tools.git

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["tests/runtimetest/","tests/integration_test/","tests/test_framework/","crates/*", "tools/*"]
+members = ["crates/*", "contest/*", "tools/*"]
 
 [profile.release]
 lto = true

justfile

@@ -4,32 +4,29 @@ alias youki := youki-dev
 KIND_CLUSTER_NAME := 'youki'
 
 cwd := justfile_directory()
+bin_dir := justfile_directory() / "bin"
 
 # build
 
 # build all binaries
-build-all: youki-release rust-oci-tests-bin runtimetest
+build-all: youki-release contest
 
 # build youki in dev mode
 youki-dev:
-    {{ cwd }}/scripts/build.sh -o {{ cwd }} -c youki
+    {{ cwd }}/scripts/build.sh -o {{ bin_dir }} -c youki
 
 # build youki in release mode
 youki-release:
-    {{ cwd }}/scripts/build.sh -o {{ cwd }} -r -c youki
+    {{ cwd }}/scripts/build.sh -o {{ bin_dir }} -r -c youki
 
-# build runtimetest binary
-runtimetest:
-    {{ cwd }}/scripts/build.sh -o {{ cwd }} -r -c runtimetest
-
-# build rust oci tests binary
-rust-oci-tests-bin:
-    {{ cwd }}/scripts/build.sh -o {{ cwd }} -r -c integration-test
+# build contest
+contest:
+    {{ cwd }}/scripts/build.sh -o {{ bin_dir }}/ -r -c contest
 
 # Tests
 
 # run integration tests
-test-integration: test-oci rust-oci-tests
+test-integration: test-oci run-contest
 
 # run all tests except rust-oci 
 test-all: test-basic test-features test-oci containerd-test # currently not doing rust-oci here
@@ -55,14 +52,14 @@ test-musl:
 
 # run oci integration tests through runtime-tools
 test-oci:
-    {{ cwd }}/scripts/oci_integration_tests.sh {{ cwd }}
+    {{ cwd }}/scripts/oci_integration_tests.sh {{ bin_dir }}
 
 # run rust oci integration tests
-rust-oci-tests: youki-release runtimetest rust-oci-tests-bin
-    {{ cwd }}/scripts/rust_integration_tests.sh {{ cwd }}/youki
+run-contest: youki-release contest
+    {{ cwd }}/scripts/contest.sh {{ bin_dir }}/youki
 
 # validate rust oci integration tests on runc
-validate-rust-oci-runc: runtimetest rust-oci-tests-bin
+validate-contest-runc: contest
     {{ cwd }}/scripts/rust_integration_tests.sh runc
 
 # test podman rootless works with youki

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
 profile="default"
-channel="1.72.0"
+channel="1.73.0"

scripts/build.sh

@@ -11,7 +11,6 @@ usage_exit() {
 VERSION=debug
 TARGET="$(uname -m)-unknown-linux-gnu"
 CRATE="youki"
-RUNTIMETEST_TARGET="$ROOT/runtimetest-target"
 features=""
 while getopts f:ro:c:h OPT; do
     case $OPT in
@@ -49,21 +48,18 @@ OUTPUT=${output:-$ROOT/bin}
 
 
 if [ "$CRATE" == "youki" ]; then
-    rm -f ${OUTPUT}/youki
+    find ${OUTPUT} -maxdepth 1 -type f -name "youki" -exec rm -ifv {} \;
     cargo build --target ${TARGET} ${OPTION} ${FEATURES} --bin youki
     mv ${ROOT}/target/${TARGET}/${VERSION}/youki ${OUTPUT}/
 fi
 
-if [ "$CRATE" == "integration-test" ]; then
-    rm -f ${OUTPUT}/integration_test
-    cargo build --target ${TARGET} ${OPTION} ${FEATURES} --bin integration_test
-    mv ${ROOT}/target/${TARGET}/${VERSION}/integration_test ${OUTPUT}/
-fi
+if [ "$CRATE" == "contest" ]; then
+    find ${OUTPUT} -maxdepth 1 -type f -name "contest" -exec rm -ifv {} \;
+    cargo build --target ${TARGET} ${OPTION} ${FEATURES} --bin contest
+    mv ${ROOT}/target/${TARGET}/${VERSION}/contest ${OUTPUT}/
 
-if [ "$CRATE" == "runtimetest" ]; then
-    rm -f ${OUTPUT}/runtimetest
-    CARGO_TARGET_DIR=${RUNTIMETEST_TARGET} RUSTFLAGS="-Ctarget-feature=+crt-static" cargo build --target ${TARGET} ${OPTION} ${FEATURES} --bin runtimetest
-    mv ${RUNTIMETEST_TARGET}/${TARGET}/${VERSION}/runtimetest ${OUTPUT}/
+    find ${OUTPUT} -maxdepth 1 -type f -name "runtimetest" -exec rm -ifv {} \;
+    CONTEST_TARGET="$ROOT/contest-target"
+    CARGO_TARGET_DIR=${CONTEST_TARGET} RUSTFLAGS="-Ctarget-feature=+crt-static" cargo build --target ${TARGET} ${OPTION} ${FEATURES} --bin runtimetest
+    mv ${CONTEST_TARGET}/${TARGET}/${VERSION}/runtimetest ${OUTPUT}/
 fi
-
-exit 0

scripts/rust_integration_tests.sh → scripts/contest.sh

@@ -20,11 +20,12 @@ ROOT=${2-$(git rev-parse --show-toplevel)}
 LOGFILE="${ROOT}/test.log"
 
 if [ ! -f ${ROOT}/bundle.tar.gz ]; then
-    cp ${ROOT}/tests/integration_test/bundle.tar.gz ${ROOT}/bundle.tar.gz
+    cp ${ROOT}/contest/contest/bundle.tar.gz ${ROOT}/bundle.tar.gz
 fi
 touch ${LOGFILE}
 
-sudo ${ROOT}/integration_test run --runtime "$RUNTIME" --runtimetest ${ROOT}/runtimetest > $LOGFILE
+# TOOD
+sudo ${ROOT}/bin/contest run --runtime "$RUNTIME" --runtimetest ${ROOT}/bin/runtimetest > $LOGFILE
 
 if [ 0 -ne $(grep "not ok" $LOGFILE | wc -l ) ]; then
     cat $LOGFILE