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

remove weave{proxy,plugin} remnants #3036

Merged
merged 3 commits into from
Jun 25, 2017
Merged

remove weave{proxy,plugin} remnants #3036

merged 3 commits into from
Jun 25, 2017

Conversation

rade
Copy link
Member

@rade rade commented Jun 24, 2017

Fixes #3035.

@rade
Copy link
Member Author

rade commented Jun 24, 2017

The 2.0 branch CI fails with exactly the same error as this branch. @bboreham @marccarre HELP!

@bboreham
Copy link
Contributor

CI failure fixed in 01194ee - nginx image was missing the ping command which the test relied on.
Evidently this changed in the last two days, but I could not trace the exact trigger.

Using the weaveworks:nettest image is better anyway, as it is already on the machine and we can use its built-in network test too (left for later).

bboreham
bboreham approved these changes Jun 25, 2017
View reviewed changes
test/090_docker_restart_policy_2_test.sh
@@ -12,7 +12,7 @@ assert_raises "check_restart $HOST1 weave"
# in the old containers being removed and new ones created
weave_on $HOST1 stop
weave_on $HOST1 launch --no-restart
assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave weaveproxy" "no"
assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave" "no"

This comment was marked as abuse.

Sign in to view

@rade rade force-pushed the 3035-remove-proxyplugin-remnants branch from 65fb131 to 77925e2 Compare June 25, 2017 17:43
@rade
Copy link
Member Author

rade commented Jun 25, 2017

This is failing CI with

--- FAIL: TestMain (0.00s)

panic: Specify weave args after --

I suspect the cause is other changes dragged in through the build-tools update, in particular weaveworks/build-tools#103.

@rade
Copy link
Member Author

rade commented Jun 25, 2017 •
edited
Loading

The failure happens because of a recent build-tools change that was introduced in weaveworks/build-tools#103, apparently to make tests in scope under prog actually execute.

rade added 2 commits June 25, 2017 20:49
@rade
update tools to weaveplugin-free version
73b2905
@rade
don't panic when TestMain is invoked as a regular test
c256dac 
Just no-op instead.

This change is necessary because previously a recent build-tools
change no longer excludes prog/* from unit testing since other
projects actually do have genuine tests under there.
@rade rade force-pushed the 3035-remove-proxyplugin-remnants branch from c4932d7 to c256dac Compare June 25, 2017 19:49
@rade rade merged commit 2245bd2 into 2.0 Jun 25, 2017
@marccarre marccarre deleted the 3035-remove-proxyplugin-remnants branch June 26, 2017 14:36
@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.
Reviewers

@bboreham bboreham bboreham approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.0.2
Development

Successfully merging this pull request may close these issues.
2 participants
@rade @bboreham