Commit Graph

64 Commits

Author SHA1 Message Date
Victor Vieux 14bf4e08b3 add -experimental to enable rescheduling
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 01:35:39 -08:00
Isabel Jimenez 2ec3c16efe adapting tests to mesos0.25 upgrade
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-06 21:12:53 -05:00
Alexandre Beslic 31791e2241 Merge pull request #1513 from vieux/compose_1.5.2
update compose to 1.5.2
2015-12-08 12:43:37 -08:00
Victor Vieux 4aafe4aa7b Merge pull request #1492 from aluzzardi/profiling
Enable profiling over HTTP in debug mode
2015-12-08 12:43:00 -08:00
Victor Vieux b399d7c7ed update compose to 1.5.2
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-07 22:05:58 -08:00
Victor Vieux 0bddb0096f longer retries
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-07 22:04:14 -08:00
Victor Vieux f1b7b7be59 fix tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-07 19:57:29 -08:00
Victor Vieux a17f182026 add mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-02 22:16:00 -08:00
Alexandre Beslic 2ac860e335 integration: wait for agents to be registered on the Manager before running tests
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-12-02 22:09:17 -08:00
Victor Vieux f73ec80548 default back to aufs
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-02 20:45:15 -08:00
Victor Vieux d295d4b323 update compose to 1.5.1
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-12-01 02:27:50 -08:00
Alexandre Beslic 374370e39d fix integration tests, --exec-driver has been removed in docker master
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-11-09 09:34:37 -08:00
Victor Vieux f3bffb2dd9 update compose to 1.5.0
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-11-03 16:45:09 -08:00
Victor Vieux 829db076c3 update compose in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-09-23 12:06:32 -07:00
Victor Vieux 82b3c2f344 choose docker-compose version
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-31 22:19:17 -07:00
Victor Vieux 32320e4249 use mesos 0.23 in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-08-07 18:45:06 -07:00
Victor Vieux 05234232a3 switch tests to overlay
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-18 21:01:11 -07:00
Andrea Luzzardi 22dcdc245d integration helpers: Allow to run multiple managers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-07-28 18:26:17 -07:00
Victor Vieux 6dc6134163 add mesos in the CI
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-04 14:25:13 -07:00
Andrea Luzzardi 7394be0704 Replace --addr with --advertise
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-26 17:43:14 -07:00
Andrea Luzzardi b4efc08dfc api: Integrate leader election.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-22 21:23:34 -07:00
Alexandre Beslic ec478d8ed5 Add integration tests for engines departure with node removal and ephemeral behavior
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 12:08:56 -07:00
Andrea Luzzardi ac18ef381d integration: cover more grounds in discovery testing.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi 7430fe5141 fix hb/timeout being time.Duration in a few places
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi 2a27adaea1 discovery integration: No need to wait anymore
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Victor Vieux 59cd11b946 change swarm.heartbeat to swarm.discovery.heartbeat
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:48:07 -07:00
Victor Vieux 5db3a9cd0e remove options struct, yay!
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:36:30 -07:00
Andrea Luzzardi 95511f1074 integration: force start_docker_with_busybox to only take the latest tag
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 15:47:53 -07:00
Andrea Luzzardi 0bf6cf6dc9 integration helpers: add start_with_busybox
starts an engine with a preloaded busybox without pulling (much faster).

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 10:51:07 -07:00
Andrea Luzzardi 7865004ec9 Merge pull request #725 from aluzzardi/discovery-integration-cleanup
Discovery integration cleanup
2015-05-06 10:50:11 -07:00
Andrea Luzzardi 75c54c22a1 integration helpers: allow tests to be located in subdirectories.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 00:35:02 -07:00
Andrea Luzzardi a2703e0562 integration: helpers cleanup.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-05 19:19:10 -07:00
Andrea Luzzardi 4ac91fd7cd integration helpers: Revamped swarm join/manage.
- swarm_join can be called multiple times. Only new nodes will join the
  discovery.
- swarm_join won't return until the nodes are visible in discovery
  (swarm list).
- swarm_manage won't return until the nodes are visible in the manager.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-05 18:35:16 -07:00
Andrea Luzzardi bd3c5c3636 Revert "use retry to wait for swarm join"
This reverts commit 89fe217e12.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

Conflicts:
	test/integration/helpers.bash
2015-05-05 18:35:09 -07:00
Andrea Luzzardi bca0e2e8c2 integration: cleanup discovery tests
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-05 16:06:41 -07:00
Andrea Luzzardi 1187069407 integration: fix nodes patterns in docker_swarm info
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-05 00:20:22 -07:00
Andrea Luzzardi b7413d3138 integration helpers: fix the wait for docker join
It used to output `[: -eq: unary operator expected` since the grep
command didn't give any output, therefore generating a syntax error.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:52:34 -07:00
Andrea Luzzardi 5d10f47b32 integration helpers: move the docker_ functions together
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
Andrea Luzzardi b4af7acd83 integration: Run tests using docker master.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
Andrea Luzzardi 86bf53a504 integration: Support using a different CLI.
- `docker` will now use the CLI defined in $DOCKER_BINARY
- In order to communicate with the host docker, one must use
  `docker_host`

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-04 23:17:29 -07:00
Andrea Luzzardi fdf74cef2a Merge pull request #465 from chanwit/test-create-cluster-on-hub
integration: add a test to verify creating cluster on hub
2015-05-04 22:00:37 -07:00
Chanwit Kaewkasi 89fe217e12 use retry to wait for swarm join
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-05-05 11:44:47 +07:00
Andrea Luzzardi 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
Andrea Luzzardi 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
Andrea Luzzardi 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
Andrea Luzzardi 3cc8a2b5fd Merge pull request #703 from aluzzardi/integration-image
integration: Use the brand new dind image.
2015-05-04 13:43:38 -07:00
Andrea Luzzardi 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
Andrea Luzzardi 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
Andrea Luzzardi 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
Andrea Luzzardi 29deacba2f fix integration test build of swarm
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 13:28:13 -07:00