7ac80a2691
Merge pull request #34674 from pradipd/windows_routingmesh
...
Enabling ILB/ELB on windows using per-node, per-network LB endpoint.
Upstream-commit: a2ee40b98c281139c75b38e0e11aa35726021169
Component: engine
2017-09-18 15:56:17 -07:00
61af2a7b87
Enabling ILB/ELB on windows using per-node, per-network LB endpoint.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 9bed0883e762181ad6c4d5607ae2228e164e44b5
Component: engine
2017-09-18 20:27:56 +00:00
f01963dfea
Merge pull request #34805 from chris-crone/containerize-integration-tests
...
Containerize integration tests
Upstream-commit: 9be245f438f9fb2eaeb7891673b16aed9262a192
Component: engine
2017-09-18 21:11:06 +02:00
af2e8abbf0
Merge pull request #34842 from dnephin/fix-integration-on-timeout
...
[integration-cli] Only attempt to find pid with local daemon
Upstream-commit: c5c0702a4d523071b3e41a13c233b6ec9e261b06
Component: engine
2017-09-16 06:48:18 -07:00
892a44a627
Various fixes
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: b7d8d2c4ab709f072cbdc4f89a8c80065648757e
Component: engine
2017-09-15 16:01:15 +02:00
3223c51c8a
Remove erroneous Println
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: eb396e8984ce64ea6ee9c04905780d74ed7d8d8b
Component: engine
2017-09-15 13:02:27 +02:00
cddfe04f6a
LCOW: Implemented support for docker cp + build
...
This enables docker cp and ADD/COPY docker build support for LCOW.
Originally, the graphdriver.Get() interface returned a local path
to the container root filesystem. This does not work for LCOW, so
the Get() method now returns an interface that LCOW implements to
support copying to and from the container.
Signed-off-by: Akash Gupta <akagup@microsoft.com >
Upstream-commit: 7a7357dae1bcccb17e9b2d4c7c8f5c025fce56ca
Component: engine
2017-09-14 12:07:52 -07:00
f34f36be87
Merge pull request #34332 from clnperez/logrus-revendor
...
revendor logrus and x/crypto
Upstream-commit: 2a54dc080471476037c87cc6961cc126368ffdd9
Component: engine
2017-09-14 11:29:05 -07:00
44733ed80a
Fixes after dnephin review
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 7dabed019a7aac9b317b586d582431eef3b65e33
Component: engine
2017-09-14 19:27:09 +02:00
6cc83af533
Fix Windows build
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 81f69a593146f61d3f6568403168ba28b1714f97
Component: engine
2017-09-14 19:27:09 +02:00
82ba6d5d3e
Test requires SameHostDaemon
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 61b13ba0d12aeeadc1c08eae62ba83f62208a6d3
Component: engine
2017-09-14 19:27:09 +02:00
a13cdc241b
Set client version instead of negotiating it
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 85431566a81792e3612df3b6b858f7b0c3506883
Component: engine
2017-09-14 19:27:09 +02:00
454535ed22
Bring up DockerNetworkSuite
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 42d812df0a12d92fad1f327f0b0f5d9eb7a9f107
Component: engine
2017-09-14 19:27:09 +02:00
58906ac91c
Remove race and split TestAPINetworkInspect test
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 6936ce3b65f149ba6ab1cd5c257358c06eb9cdbb
Component: engine
2017-09-14 19:27:09 +02:00
4d643fb18a
Fixes for dnephin review
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 86f9eb4a085a61b3355dc38452c47def806bf7c9
Component: engine
2017-09-14 19:27:09 +02:00
f23d5bec57
Skip some tests for E2E
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: f089a1df393228085c4895b8db0fa95128173398
Component: engine
2017-09-14 19:27:09 +02:00
abba79d025
Check integration test requirements using daemon
...
When running against a remote daemon, we cannot use the local
filesystem to determine configuration.
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: b1fb41988dc1b7071a58f76f6ad2730fc1a02eca
Component: engine
2017-09-14 19:27:09 +02:00
2801aaa58e
Use TLS for tests if needed
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 0bdba0e91a072ee2cdecb4e632c13f187eb88e9c
Component: engine
2017-09-14 19:27:09 +02:00
e3234a8303
Fix tests that depend on clean environment
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: dc6ddfa8415d90e9a9788d5cfd5a10c17449bbc9
Component: engine
2017-09-14 19:27:09 +02:00
fe0ff1cb68
Add E2E requirement for integration tests
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: d622e81af50f4690d5867a89b430d1b94707fd26
Component: engine
2017-09-14 19:27:09 +02:00
16788ee2e5
Protect entire environment when testing
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 063c89c71fd1fbeb7ef7c46f43ee805b620e7136
Component: engine
2017-09-14 19:27:09 +02:00
97847089f1
revendor logrus and x/crypto
...
this fixes the issue that was blocking a test from running on ppc64le.
the logrus revendor changes the color code used in that same test, so
that breaks the test for all platforms (updated in this pr)
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 008b217844f8738cc47ef9ff108dc41dc37736cc
Component: engine
2017-09-14 11:05:47 -05:00
1546d32eb0
Only attempt to find pid with local daemon
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 014cecda464fb1171e613676e0a8a85c02ec1674
Component: engine
2017-09-14 12:05:18 -04:00
c95e22b252
Merge pull request #34837 from tophj-ibm/switch-hub-test-to-alpine
...
[integration-cli] fix p/z HubPullSuite tests
Upstream-commit: 3a081f53c150190201ddb05c97344ed5071446b0
Component: engine
2017-09-14 18:02:13 +02:00
023fe0b32f
[integration-cli] fix p/z HubPullSuite tests
...
This test tries to pull all the tags in the busybox repo and looks to see
if there were more than two images pulled. This was failing on
p/z due to the recent change to manifest lists, where one of the busybox
tags didn't have a p/z manifest in it's manifest list.
This error seems fine to me, so I changed the test to see if pull fails,
it fails with the "manifest not found" error.
Also switched from busybox -> alpine, because it has significantly less tags,
and the images are close in size.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 5739ba1b918402b8eda748ac2f5dd7ce00f2e69f
Component: engine
2017-09-14 09:42:09 -04:00
93617a3f74
Merge pull request #34784 from dnephin/fix-client-not-found
...
Cleanup client not found errors
Upstream-commit: bb0e8ee51c8940c3ce23e4f594068612203c6139
Component: engine
2017-09-14 12:04:56 +02:00
c30f13232a
Merge pull request #34686 from mion00/templating-node-hostname-support
...
Add support for .Node.Hostname templating in swarm services
Upstream-commit: 2ee8ef864f9fb9c31848fe10a61605a39fb81635
Component: engine
2017-09-13 21:06:11 -07:00
806d838e90
LCOW: Spot fix for multi-os image pulling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b291f5a31728f7ff6386bb37f15e7c0885d3b2a7
Component: engine
2017-09-12 23:33:34 -07:00
ee7b60968b
Cleanup client not found errors.
...
And fix remove calls to return a notFound error
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 81bb9978ab5ac99e84a5bf62d0d469f0aec1d506
Component: engine
2017-09-11 19:53:18 -04:00
b543555e86
Merge pull request #34761 from dnephin/fix-mount-create-api-test
...
Some cleanup of mount create API test
Upstream-commit: bf3a8bddeb5e1ae04b6f73bfe811372ee3e78e36
Component: engine
2017-09-07 17:09:19 -04:00
2e7d5b113f
Merge pull request #34757 from dnephin/fix-test-run-environment
...
Fix TestRunEnvironment
Upstream-commit: d76f0d4e0694f5adcaab327e801ee8553620c5b3
Component: engine
2017-09-07 11:28:57 -07:00
d7504f67d1
Merge pull request #34738 from wgliang/optimization1
...
Optimize some wrong usage and spelling
Upstream-commit: 2dcb77b24c80dd95b52358c92436f68f2a33eb01
Component: engine
2017-09-07 09:45:14 -07:00
a8b7a6b071
Merge pull request #34730 from simonferquel/fix-TestEventsOOMDisableTrue-flakkyness
...
Events CLI tests: fix flakyness of TestEventsOOMDisableTrue
Upstream-commit: 72eb1d0a47488d279df2b80bfd3f6091eaff66a7
Component: engine
2017-09-07 11:16:37 +02:00
eec1d4ef54
Optimize some wrong usage and spelling
...
Signed-off-by: wgliang <liangcszzu@163.com >
Upstream-commit: 94cefa21459a0c620e5a9c2da04df6d3a43dae17
Component: engine
2017-09-07 09:44:08 +08:00
567b25fb28
Some cleanup of mount create API test
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 58b96aced87b33c4175fa5d3422289f763ab599d
Component: engine
2017-09-06 19:32:35 -04:00
11b376603e
Fix a bad assumption
...
If the empty variable happens to be sorted to the end of the list then TrimSpace()
would remove it. Instead only strip the single trailing newline.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: fff605c3b3557acf6bf793813d695fba59d7fa21
Component: engine
2017-09-06 17:32:56 -04:00
33179f56a2
force inspect test format
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 8e6567cb837e1c885de5146517557c7a5d8a5f17
Component: engine
2017-09-05 08:31:44 -07:00
30986cbc05
Avoid failing the test if container is already stopped
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: adf75503dba2e782139173c011999eacd0c3d7e2
Component: engine
2017-09-05 17:19:57 +02:00
55c903723c
Add support for .Node.Hostname templating in swarm services
...
Signed-off-by: Carlo Mion <mion00@gmail.com >
Upstream-commit: e2f09fa6dd1705eb69ab97fbf759253a4162228a
Component: engine
2017-09-02 10:06:16 +02:00
6742eeff7c
Remove assertions that were testing CLI behaviour.
...
These tests will be moved to docker/cli
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6590ee0dfba45d7eb4ee12f72621b90294925f20
Component: engine
2017-08-31 18:19:17 -04:00
c7214e3099
Merge pull request #34656 from dnephin/move-testenv-to-internal
...
Move integration-cli/environment to an internal package
Upstream-commit: 184cea5ff710abde25547749e5608b24a255ba09
Component: engine
2017-08-31 08:52:24 -07:00
98aa729835
Merge pull request #34554 from dnephin/use-release-version-of-docker-cli
...
Pin docker-cli version to the 17.06-ce release version
Upstream-commit: e23965d620e1655f44d47edd8b5e08c2c384fd03
Component: engine
2017-08-30 13:43:39 -04:00
9f71faec7e
Refactor test environment
...
split all non-cli portions into a new internal/test/environment package
Set a test environment on packages instead of creating new ones.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f85ef42ea538911c82821ab6cc0166d492e9a379
Component: engine
2017-08-30 13:13:18 -04:00
511c42a159
Update fixtures/load to use the APIClient
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 61e7d0595d0838671570fbaef21f35a4a41faed7
Component: engine
2017-08-30 13:11:06 -04:00
55ca4eff51
Merge pull request #33684 from dnephin/update-service-ps-tests
...
Update service ps to be an API test
Upstream-commit: 15b8d0420b57776028875dbf89fc6d9dbb0666e2
Component: engine
2017-08-29 09:44:20 +02:00
f0c0f969b6
integration-cli: fix testutil refactor merge conflict
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ba6f9e4cc9687dd1ccd1ab304b363ed578c6d908
Component: engine
2017-08-28 10:19:54 -07:00
ef16add9bb
Merge pull request #34263 from estesp/chown-flag-add-copy
...
Add --chown flag to ADD/COPY commands
Upstream-commit: a1183dda578f531ef65766611f9e16a0636e3a17
Component: engine
2017-08-28 09:50:44 -07:00
1057cf80e4
Replace service ps cli tests with service inspect API test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6cd6d8646a90fa2013416bc8f11bd78d72c4180d
Component: engine
2017-08-25 17:27:41 -04:00
402a69d8fb
Cleanup daemon.LoadBusybox() to use the API instead of client
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 98a4613017df2b7de045d93e25a376fd00baeb0c
Component: engine
2017-08-25 17:24:25 -04:00
e8bff97a66
Update tests to use icmd
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 92427b3a8146e048c4b85e5ece1530da97d8472d
Component: engine
2017-08-25 12:07:30 -04:00
