Fix CI

.github/workflows/integration_tests_validation.yaml

@@ -36,6 +36,6 @@ jobs:
       - run: sudo apt-get -y update
       - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
       - name: Validate tests on runc
-        run: cd scripts && RUNTIME=runc sudo ./rust_integration_test.sh
+        run: cd scripts && RUNTIME=runc ./rust_integration_tests.sh
       - name: Validate tests on youki
-        run: cd ./scripts && sudo sudo ./rust_integration_test.sh
+        run: cd ./scripts && sudo ./rust_integration_tests.sh

.github/workflows/main.yml

@@ -17,11 +17,13 @@ jobs:
         id: filter
         with:
           filters: |
-            ./crates/youki: crates/youki/**
-            ./crates/libcontainer: crates/libcontainer/**
-            ./crates/libcgroups: crates/libcgroups/**
-            ./crates/libseccomp: crates/libseccomp/**
-            ./rust_integration_tests: ./integration_tests/rust-integration-tests/**
+            crates/youki: crates/youki/**
+            crates/libcontainer: crates/libcontainer/**
+            crates/libcgroups: crates/libcgroups/**
+            crates/libseccomp: crates/libseccomp/**
+            integration_tests/rust-integration-tests/runtimetest: ./integration_tests/rust-integration-tests/runtimetest
+            integration_tests/rust-integration-tests/integration_test: ./integration_tests/rust-integration-tests/integration_test
+            integration_tests/rust-integration-tests/test_framework: ./integration_tests/rust-integration-tests/test_framework
   check:
     needs: [changes]
     if: ${{ !contains(needs.changes.outputs.dirs, '[]') }}
@@ -63,7 +65,7 @@ jobs:
       - run: sudo apt-get -y update
       - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
       - name: Run tests
-        run: cargo test --all --all-features --no-fail-fast
+        run: cd ./crates && cargo test --all --all-features --no-fail-fast
   coverage:
     runs-on: ubuntu-latest
     name: Run test coverage
@@ -90,6 +92,7 @@ jobs:
         run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
       - name: Run Test Coverage for youki
         run: |
+          cd ./crates
           cargo llvm-cov clean --workspace
           cargo llvm-cov --no-report
           cargo llvm-cov --no-run --lcov --ignore-filename-regex "libseccomp/src|integration_test/src|test_framework/src|systemd_api.rs" --output-path ./coverage.lcov
@@ -122,6 +125,6 @@ jobs:
       - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.11.0"
+          go-version: "1.17.6"
       - name: Run integration tests
-        run: ./scripts/oci_integration_test.sh
+        run: ./scripts/oci_integration_tests.sh

.gitmodules

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

crates/Makefile

@@ -3,10 +3,10 @@
 TGT = x86_64-unknown-linux-gnu
 
 debug:
-	cargo build $(TGT) && cp ./target/$(TGT)/debug/youki ./youki_bin
+	cargo build && cp ./target/$(TGT)/debug/youki ./youki_bin
 
 release:
-	cargo build --release $(TGT) && cp ./target/$(TGT)/release/youki ./youki_bin
+	cargo build --release && cp ./target/$(TGT)/release/youki ./youki_bin
 
 clean:
 	rm ./youki_bin

integration_tests/oci-runtime-tests/src/github.com/opencontainers/runtime-tools

@@ -0,0 +1 @@
+Subproject commit 0105384f68e16803891d0a17d9067b1def6a2778

scripts/build.sh

@@ -1,12 +1,14 @@
 #! /bin/sh
 
-cd ../crates
-make release
-mv ./youki_bin ../scripts/youki
+ROOT=$(git rev-parse --show-toplevel)
 
-cd ../integration_tests/rust-integration-tests
+cd ${ROOT}/crates
+make release
+mv ./youki_bin ${ROOT}/scripts/youki
+
+cd ${ROOT}/integration_tests/rust-integration-tests
 make FLAG=--release all
-mv ./runtimetest_bin ../../scripts/runtimetest
-mv ./integration_test_bin ../../scripts/integration_test
+mv ./runtimetest_bin ${ROOT}/scripts/runtimetest
+mv ./integration_test_bin ${ROOT}/scripts/integration_test
 
 exit 0

scripts/oci_integration_tests.sh

@@ -1,12 +1,13 @@
 #!/bin/bash -eu
 
-./build.sh
+ROOT=$(git rev-parse --show-toplevel)
 
-SCRIPTS_DIR=$(pwd)
+${ROOT}/scripts/build.sh
+
+SCRIPTS_DIR=${ROOT}/scripts
 RUNTIME=${SCRIPTS_DIR}/youki
-OCI_TEST_DIR=../integration_tests/oci-runtime-tools/src/github.com/opencontainers/runtime-tools
+OCI_TEST_DIR=${ROOT}/integration_tests/oci-runtime-tests/src/github.com/opencontainers/runtime-tools
 PATTERN=${1:-.}
-
 cd $OCI_TEST_DIR
 
 test_cases=(
@@ -89,8 +90,8 @@ check_environment() {
 }
 
 for case in "${test_cases[@]}"; do
-  if [[ ! -e "${ROOT}/integration_test/runtime-tools/src/github.com/opencontainers/runtime-tools/validation/$case" ]]; then
-    GO111MODULE=auto GOPATH=${ROOT}/integration_test/runtime-tools make runtimetest validation-executables
+  if [[ ! -e "${OCI_TEST_DIR}/validation/$case" ]]; then
+    GO111MODULE=auto GOPATH=${ROOT}/integration_tests/oci-runtime-tests make runtimetest validation-executables
     break
   fi
 done
@@ -109,7 +110,7 @@ for case in "${test_cases[@]}"; do
   echo "Running $case"
   logfile="./log/$case.log"
   mkdir -p "$(dirname $logfile)"
-  sudo RUST_BACKTRACE=1 RUNTIME=${RUNTIME} ../integration_test/runtime-tools/src/github.com/opencontainers/runtime-tools/validation/$case >$logfile 2>&1 || (cat $logfile && exit 1)
+  sudo RUST_BACKTRACE=1 RUNTIME=${RUNTIME} ${OCI_TEST_DIR}/validation/$case >$logfile 2>&1 || (cat $logfile && exit 1)
   if [ 0 -ne $(grep "not ok" $logfile | wc -l ) ]; then
       cat $logfile
       exit 1

scripts/rust_integration_tests.sh

@@ -1,15 +1,21 @@
 #! /bin/sh
 
+ROOT=$(git rev-parse --show-toplevel)
+
+SCRIPT_DIR=${ROOT}/scripts
+
 if [ "$RUNTIME" = "" ]; then
-    RUNTIME="./youki"
+    RUNTIME="${SCRIPT_DIR}/youki"
 fi
 
-LOGFILE="./test.log"
+LOGFILE="${SCRIPT_DIR}/test.log"
 
-./build.sh
+cd ${SCRIPT_DIR}
 
-cp ../integration_tests/rust-integration-tests/integration_test/bundle.tar.gz ./bundle.tar.gz
-touch ./test.log
+${SCRIPT_DIR}/build.sh
+
+cp ${ROOT}/integration_tests/rust-integration-tests/integration_test/bundle.tar.gz ${SCRIPT_DIR}/bundle.tar.gz
+touch ${LOGFILE}
 
 YOUKI_LOG_LEVEL="error" sudo ./integration_test run --runtime $RUNTIME --runtimetest ./runtimetest > $LOGFILE