summaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorTamir Duberstein <tamird@google.com>2020-09-11 01:55:59 -0700
committergVisor bot <gvisor-bot@google.com>2020-09-11 01:57:42 -0700
commit964447c8ce1ba4f3c7413e90069a045fe0877c2a (patch)
treef53c64671dc03479577ed8ad3dea08dbf0330307 /scripts
parent365545855f7713236d77d3e263ad09ebffa85bb2 (diff)
Clean up image construction
- Skip `docker inspect`; `docker pull` is idempotent - Remove unnecessary CMD directives in Dockerfiles - Run bazel before building images to catch errors sooner PiperOrigin-RevId: 331107815
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/packetdrill_tests.sh4
-rwxr-xr-xscripts/packetimpact_tests.sh5
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/packetdrill_tests.sh b/scripts/packetdrill_tests.sh
index 1a8181ac8..cdb98c834 100755
--- a/scripts/packetdrill_tests.sh
+++ b/scripts/packetdrill_tests.sh
@@ -16,8 +16,8 @@
source $(dirname $0)/common.sh
-make load-packetdrill
+QUERY_RESULT=$(query 'attr(tags, manual, tests(//test/packetdrill/...))')
install_runsc_for_test runsc-d
-QUERY_RESULT=$(query "attr(tags, manual, tests(//test/packetdrill/...))")
+make load-packetdrill
test_runsc $QUERY_RESULT
diff --git a/scripts/packetimpact_tests.sh b/scripts/packetimpact_tests.sh
index 77fb84bc3..4878b72f4 100755
--- a/scripts/packetimpact_tests.sh
+++ b/scripts/packetimpact_tests.sh
@@ -16,8 +16,9 @@
source $(dirname $0)/common.sh
-make load-packetimpact
+
+QUERY_RESULT=$(query 'attr(tags, packetimpact, tests(//test/packetimpact/...))')
install_runsc_for_test runsc-d
-QUERY_RESULT=$(query "attr(tags, packetimpact, tests(//test/packetimpact/...))")
+make load-packetimpact
test_runsc $QUERY_RESULT