Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump tools subtree and fix integration tests #2136

Merged
merged 4 commits into from
Jan 19, 2017
Merged

Bump tools subtree and fix integration tests #2136

merged 4 commits into from
Jan 19, 2017

Conversation

2opremio
Copy link
Contributor

@2opremio 2opremio commented Jan 17, 2017

  • Bump tools subtree
    git subtree pull --squash --prefix tools/ git@github.com:weaveworks/build-tools.git master
  • Revert changes from to tools subtree incorrectly done locally
  • Fix integration tests, by fixing problems introduced locally (by Fix linter errors #2068) and remotely (fixed by Fix integration tests build-tools#65)
  • Make integration tests more robust

@2opremio 2opremio requested a review from ekimekim January 17, 2017 15:04
@2opremio
Copy link
Contributor Author

It needs the linter fixes from #2068

@2opremio
Copy link
Contributor Author

@iaguis Continuing with #2068, this removes your linter changes in tools/lint by the upstream version.

@2opremio 2opremio force-pushed the bump-tools branch 3 times, most recently from 0685eab to f250d00 Compare January 18, 2017 15:17
@2opremio
Copy link
Contributor Author

2opremio commented Jan 18, 2017

It seems that the recent shellcheck fixes in build-tools broke the integrations tests. For instance weaveworks/build-tools@83d5bd1#commitcomment-20521055

There are still some errors I am debugging now.

@iaguis
Copy link
Contributor

iaguis commented Jan 18, 2017

It seems that the recent shellcheck fixes in build-tools broke the integrations tests. For instance weaveworks/build-tools@83d5bd1#commitcomment-20521055

There are still some errors I am debugging now.

I see, I fixed some errors like that one but I missed the ones breaking integration tests because they don't run on our CI. Sorry about that :(

@2opremio
Copy link
Contributor Author

@iaguis No worries, so far the problems come from fixes done upstream

@2opremio 2opremio force-pushed the bump-tools branch 10 times, most recently from abb0dc2 to 230f494 Compare January 19, 2017 10:07
Alfonso Acosta added 4 commits January 19, 2017 11:23
a3b18bf Merge pull request #65 from weaveworks/fix-integration-tests
ecb5602 Fix integration tests
f9dcbf6 ... without tab (clearly not my day)
a6215c3 Add break I forgot
0e6832d Remove incorrectly added tab
eb26c68 Merge pull request #64 from weaveworks/remove-test-package-linting
f088e83 Review feedback
2c6e83e Remove test package linting
2b3a1bb Merge pull request #62 from weaveworks/revert-61-test-defaults
8c3883a Revert "Make no-go-get the default, and don't assume -tags netgo"
e75c226 Fix bug in GC of firewall rules.
e49754e Merge pull request #51 from weaveworks/gc-firewall-rules
191f487 Add flag to enale/disable firewall rules' GC.
567905c Add GC of firewall rules for weave-net-tests to scheduler.
03119e1 Fix typo in GC of firewall rules.
bbe3844 Fix regular expression for firewall rules.
c5c23ce Pre-change refactoring: splitted gc_project function into smaller methods for better readability.
ed5529f GC firewall rules
ed8e757 Merge pull request #61 from weaveworks/test-defaults
57856e6 Merge pull request #56 from weaveworks/remove-wcloud
dd5f3e6 Add -p flag to test, run test in parallel
62f6f94 Make no-go-get the default, and don't assume -tags netgo
8946588 Merge pull request #60 from weaveworks/2647-gc-weave-net-tests
4085df9 Scheduler now also garbage-collects VMs from weave-net-tests.
d1a5e46 Remove wcloud cli tool

git-subtree-dir: tools
git-subtree-split: a3b18bfe932ddb8adaceb0adb2df35c579bf4ee4
@2opremio 2opremio changed the title Bump tools subtree Bump tools subtree and fix integration tests Jan 19, 2017
@2opremio 2opremio merged commit 589171b into master Jan 19, 2017
@2opremio 2opremio deleted the bump-tools branch January 19, 2017 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants