|
@@ -19,11 +19,11 @@ source hack/make/.integration-test-helpers
|
|
# build --squash is not supported with containerd integration.
|
|
# build --squash is not supported with containerd integration.
|
|
if [ -n "$TEST_INTEGRATION_USE_SNAPSHOTTER" ]; then
|
|
if [ -n "$TEST_INTEGRATION_USE_SNAPSHOTTER" ]; then
|
|
PY_TEST_OPTIONS="$PY_TEST_OPTIONS --deselect=tests/integration/api_build_test.py::BuildTest::test_build_squash"
|
|
PY_TEST_OPTIONS="$PY_TEST_OPTIONS --deselect=tests/integration/api_build_test.py::BuildTest::test_build_squash"
|
|
-
|
|
|
|
- # TODO(vvoland): re-enable after https://github.com/docker/docker-py/pull/3203 is merged and in a tagged release.
|
|
|
|
- PY_TEST_OPTIONS="$PY_TEST_OPTIONS --deselect=tests/integration/api_image_test.py::CommitTest::test_commit"
|
|
|
|
- PY_TEST_OPTIONS="$PY_TEST_OPTIONS --deselect=tests/integration/api_image_test.py::CommitTest::test_commit_with_changes"
|
|
|
|
fi
|
|
fi
|
|
|
|
+
|
|
|
|
+# TODO(vvoland): re-enable after https://github.com/docker/docker-py/pull/3203 is included in the DOCKER_PY_COMMIT release.
|
|
|
|
+PY_TEST_OPTIONS="$PY_TEST_OPTIONS --deselect=tests/integration/api_image_test.py::CommitTest::test_commit"
|
|
|
|
+PY_TEST_OPTIONS="$PY_TEST_OPTIONS --deselect=tests/integration/api_image_test.py::CommitTest::test_commit_with_changes"
|
|
(
|
|
(
|
|
bundle .integration-daemon-start
|
|
bundle .integration-daemon-start
|
|
|
|
|