Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Fix various CI failures #3061

Merged
merged 3 commits into from
Jul 13, 2017
Merged

Fix various CI failures #3061

merged 3 commits into from
Jul 13, 2017

Conversation

bboreham
Copy link
Contributor

@bboreham bboreham commented Jul 12, 2017

1. Upgrade tools submodule and move to Docker 17.06
Lots of failures with defunct processes: these come from an Ubuntu update job, so I disabled that in weaveworks/build-tools#108.

However we are unable to install Docker 1.13 the way we used to, because the package has been removed from the script we used. Also not many people use Docker 1.13 so it's not a very good basis for our CI tests.

Therefore I have upgraded all the way to the latest Docker 17.06.

2. Test 360 failed due to not seeing a particular error message.
This is due to an upstream change in the alpine image, so I made another image to trigger the error.

3. Test 603 failed due to Docker generating a different error message.
I made my own docker-py image which works with either

bboreham added 2 commits July 13, 2017 13:41
Previously we used 'alpine' which had no 'CMD' line, but that changed
upstream, so generate our own trivial image for this purpose.
Before this change, when using Docker 17.06 we get:
tests/integration/container_test.py:121: in test_create_with_restart_policy
    'You cannot remove a running container', err
    E   AssertionError: 'You cannot remove a running container' not found in u'You cannot remove a restarting container

The modified image simply checks for "You cannot remove a".
@bboreham bboreham changed the title Upgrade to Docker 17.06, including newer tools submodule Fix various CI failures Jul 13, 2017
@bboreham bboreham changed the base branch from master to 2.0 July 13, 2017 15:06
@marccarre marccarre merged commit 9057527 into 2.0 Jul 13, 2017
@marccarre marccarre deleted the docker-17.6 branch July 13, 2017 15:38
@bboreham bboreham modified the milestone: 2.0.2 Jul 19, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants