netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add KVM, overlay and host network to image tests

Browse Source 
PiperOrigin-RevId: 202236006
Change-Id: I4ea964a70fc49e8b51c9da27d77301c4eadaae71
This commit is contained in:
Fabricio Voznika
2018-06-26 19:05:50 -07:00
committed by Shentubot
parent dc33d71f8c
commit c186e408cc
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kokoro/gcp_ubuntu/run_tests.sh
+3
View File
@@ -46,6 +46,9 @@ exit_code=${?}
if [[ ${exit_code} -eq 0 ]]; then
# image_test is tagged manual
bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime} //runsc/test/image:image_test
bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime}-kvm //runsc/test/image:image_test
bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime}-nethost //runsc/test/image:image_test
bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime}-overlay //runsc/test/image:image_test
exit_code=${?}
fi
pkg/sentry/fs/overlay.go
+1 -1
View File
@@ -113,7 +113,7 @@ func NewOverlayRoot(ctx context.Context, upper *Inode, lower *Inode, flags Mount
// - lower must not require that file objects be revalidated.
// - lower must not have dynamic file/directory content.
func NewOverlayRootFile(ctx context.Context, upperMS *MountSource, lower *Inode, flags MountSourceFlags) (*Inode, error) {
if IsRegular(lower.StableAttr) {
if !IsRegular(lower.StableAttr) {
return nil, fmt.Errorf("lower Inode is not a regular file")
}
msrc := newOverlayMountSource(upperMS, lower.MountSource, flags)
runsc/test/image/install.sh
+8 -1
View File
@@ -75,10 +75,17 @@ if [[ ${uninstall} == 0 ]]; then
mkdir -p "${logdir}"
sudo -n chmod a+wx "${logdir}"
sudo -n "${dockercfg}" runtime-add "${runtime}" "${runsc}" --debug-log-dir "${logdir}" --debug --strace --log-packets
declare -r args="--debug-log-dir "${logdir}" --debug --strace --log-packets"
sudo -n "${dockercfg}" runtime-add "${runtime}" "${runsc}" ${args}
sudo -n "${dockercfg}" runtime-add "${runtime}"-kvm "${runsc}" --platform=kvm ${args}
sudo -n "${dockercfg}" runtime-add "${runtime}"-hostnet "${runsc}" --network=host ${args}
sudo -n "${dockercfg}" runtime-add "${runtime}"-overlay "${runsc}" --overlay ${args}
else
sudo -n "${dockercfg}" runtime-rm "${runtime}"
sudo -n "${dockercfg}" runtime-rm "${runtime}"-kvm
sudo -n "${dockercfg}" runtime-rm "${runtime}"-hostnet
sudo -n "${dockercfg}" runtime-rm "${runtime}"-overlay
fi
echo "Restarting docker service..."