4b3bc9b35b
integration: Fix tests in jenkins.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 20:35:56 -07:00
3338a12295
Merge pull request #712 from aluzzardi/integration-aufs
...
integration: Use aufs by default.
2015-05-04 17:39:01 -07:00
ebcf4f7272
Merge pull request #711 from aluzzardi/integration-fix-dockerfile
...
integration: Added missing dependency to Dockerfile.
2015-05-04 17:33:51 -07:00
6df673372f
integration: Use aufs by default.
...
The problem has been fixed in the dind images.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 17:29:00 -07:00
a2862280f1
integration: Added missing dependency to Dockerfile.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 17:25:02 -07:00
ae77390be2
Merge pull request #709 from aluzzardi/integration-fix-attach
...
fix attach integration test
2015-05-04 15:41:12 -07:00
af09d0c432
Merge pull request #704 from jimmyxian/bug-fix-tag
...
bug fix: add return when not found image
2015-05-04 15:29:39 -07:00
97aad7e60c
fix attach integration test
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 15:18:03 -07:00
851e978dcd
Merge pull request #696 from aluzzardi/integration-in-docker
...
integration tests: Support for running within Docker.
2015-05-04 14:54:08 -07:00
d41e7c89b2
Merge pull request #708 from aluzzardi/integration-dont-build
...
integration tests: Don't build binaries anymore, it's too slow.
2015-05-04 14:52:01 -07:00
c236e2f11d
integration runner: run tests on a fresh binary.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 14:46:00 -07:00
2600c8823b
integration tests: Support for running within Docker.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 14:46:00 -07:00
4ac0a43753
travis: Lint all shell files.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 14:46:00 -07:00
f50af455fa
integration tests: Don't build binaries anymore, it's too slow.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 14:20:28 -07:00
aa98a1d5c3
Merge pull request #702 from aluzzardi/integration-fix-exec
...
DO NOT MERGE - Integration fix exec
2015-05-04 13:44:35 -07:00
3cc8a2b5fd
Merge pull request #703 from aluzzardi/integration-image
...
integration: Use the brand new dind image.
2015-05-04 13:43:38 -07:00
b27e9896bc
Merge pull request #700 from aluzzardi/integration-drivers
...
integration tests: run with native/vfs by default.
2015-05-04 13:43:16 -07:00
ad98b865b7
integration: Run engines with --net=host.
...
Since we were mapping the port back to the host anyway, this doesn't
change anything.
However, it does fix `docker exec`.
Fixes #658
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 13:36:36 -07:00
f802da02d7
bug fix return when not found image
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-04 04:48:44 -04:00
24aaaa029e
integration: Use the brand new dind image.
...
We now have dockerswarm/dind:
- Much more lightweight.
- Exists in every version since Docker 1.0.0.
Depends on #700 as it cannot run on aufs.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-03 19:20:47 -07:00
671ddc8feb
integration tests: run with native/vfs by default.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-03 19:08:02 -07:00
92f8c8ec60
Merge pull request #693 from aluzzardi/integration-retry
...
integration: Add the re-usable "retry" helper.
2015-05-02 16:17:38 -07:00
a6ad9a073a
Merge pull request #690 from aluzzardi/lint-tests
...
travis: Lint test files (ensure they are not space indented)
2015-04-30 22:32:48 -07:00
f9a03c62f1
integration: Add the re-usable "retry" helper.
...
Retry was kind of extracted from wait_until_reachable. The goal is to be
able to wait for a command to succeed, or fail if it doesn't succeed
after a defined number of attempts.
Indirectly improve the error logging: the output of the retry command
won't show up unless it constantly failed.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 20:09:54 -07:00
85b4163f69
travis: Lint test files (ensure they are not space indented)
...
Fixed tab/spaces for existing integration tests.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 17:31:14 -07:00
b39e023e03
Merge pull request #673 from vieux/labels_storage
...
store constraints and affinities as labels
2015-04-30 14:36:23 -07:00
f53b5df834
store constaints and affinities in labels
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-30 14:33:21 -07:00
5872d4c7b0
Merge pull request #688 from aluzzardi/fix-integration
...
fix integration test build of swarm
2015-04-30 14:32:34 -07:00
d978dcbb9c
Merge pull request #675 from snrism/dependency_integration_test
...
Add Integration test for dependency filters
2015-04-30 13:49:46 -07:00
1b7d8ce5d3
Add Integration test for dependency filters
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-30 20:37:53 +00:00
29deacba2f
fix integration test build of swarm
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 13:28:13 -07:00
6eceffacf9
use cluster.ContainerConfig
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-30 11:44:25 -07:00
3e8d48f98e
Merge pull request #655 from jimmyxian/add-cp-export-history-save-integration-test
...
Add cp/export/history/save integration test
2015-04-30 11:39:33 -07:00
e7cfa95b39
Merge pull request #637 from jimmyxian/add-commit-exec-rename-test
...
Add commit/exec integration test
2015-04-30 11:36:54 -07:00
24ea07f9ec
Merge pull request #685 from aluzzardi/fix-integration
...
Fix integration test cleanup.
2015-04-28 16:52:54 -07:00
246bee3b62
Merge pull request #684 from vieux/private_pull
...
support pulling private images from docker pull
2015-04-28 15:48:20 -07:00
b71d5fa19c
Fix integration test cleanup.
...
- Do not run swarm using a function since it forks a subshell and we end
up killing it instead of the binary.
- Build a binary at each run instead of using go run. This is faster and
fixes the cleanup for the same reason as the subshell.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-28 15:47:25 -07:00
e5f4243dad
support pulling private images from docker pull
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-28 11:17:44 -07:00
7b459eb4ba
Merge pull request #683 from icecrime/fail_fast_on_create
...
Fast exit from create on invalid command-line
2015-04-28 10:52:20 -07:00
c3903d69f9
Fast exit from create on invalid command-line
...
The `create` command now fails immediately when invoked with an invalid
command-line rather than going as far as initializing discovery and
creating a cluster.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-28 09:47:06 -07:00
6b5176fd08
Merge pull request #681 from jimmyxian/fix-return-value
...
fix return value
2015-04-27 18:45:48 -07:00
40a3eb1aa1
fix return value
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-27 21:35:46 -04:00
e08d32c7e8
Merge pull request #680 from vieux/fix_error_test
...
fix error message in tests
2015-04-27 14:54:06 -07:00
0924df6250
fix error message in tets
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 13:47:53 -07:00
24396d8509
Merge pull request #669 from jimmyxian/improve-rename
...
improve rename
2015-04-27 12:39:48 -07:00
30790fb1e3
Merge pull request #667 from vieux/affinity_labels
...
Affinity labels like `-e affinity:com.example.type==test`
2015-04-27 12:36:07 -07:00
9fd2a3ebc2
Merge pull request #679 from vieux/build
...
use godep go run everywhere in tests
2015-04-27 12:28:10 -07:00
622cd84f59
Merge pull request #666 from abronan/add_warning_integration_test
...
Add note against using devicemapper as a storage driver to run the integration tests
2015-04-27 11:53:49 -07:00
c7746f9463
use godep go run everywhere in tests
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 10:45:45 -07:00
28918e7e0a
Merge pull request #678 from vieux/fix_tests
...
fix syntax error in tests
2015-04-27 10:45:12 -07:00
Andrea Luzzardi
Alexandre Beslic
Xian Chaobo
Victor Vieux
Sriram Natarajan
Arnaud Porterie