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

MAISTRA-1627, MAISTRA-1660: Fix lint, gen-check and integration test failures #138

Merged
merged 12 commits into from
Jul 16, 2020

Conversation

jwendell
Copy link
Member

@jwendell jwendell commented Jul 10, 2020

This PR covers a bunch of fixes for failures:

  • Lint failures: now make lint works (MAISTRA-1627)
  • Gen failures: now make gen-check works (MAISTRA-1627)
  • Integration test failures: now integration tests work (MAISTRA-1660)

For the last item we had to bring the fix from upstream release-1.6 branch, hence some commits not related to this PR itself. This is to avoid cherry-picking just one commit and have to resolve conflicts later.

jwendell and others added 4 commits July 10, 2020 12:40
* Add version label to metric

Signed-off-by: Liam White <liam@tetrate.io>

* back to gauge

Signed-off-by: Liam White <liam@tetrate.io>

Co-authored-by: Liam White <liam@tetrate.io>
@jwendell
Copy link
Member Author

/retest

Copy link
Contributor

@brian-avery brian-avery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaving this open until questions are answered.

Copy link

@knrc knrc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Holding until we have Brian's question answered

…n upgrade with dry run option (#25207) (#25425)

Co-authored-by: Zufar Dhiyaulhaq <zufardhiyaulhaq@gmail.com>
@dgn
Copy link
Contributor

dgn commented Jul 13, 2020

/retest

1 similar comment
@dgn
Copy link
Contributor

dgn commented Jul 15, 2020

/retest

jwendell and others added 2 commits July 15, 2020 13:33
Co-authored-by: Oliver Liu <yonggangl@google.com>
@jwendell
Copy link
Member Author

Fixed the Copyright

@jwendell
Copy link
Member Author

/test lint

@jwendell
Copy link
Member Author

/test unit

@jwendell
Copy link
Member Author

/test integration

istio-testing and others added 2 commits July 15, 2020 19:30
* fixed typo

* fix the default behavior

Co-authored-by: zhengzhey <zhengzhey@google.com>
…o MAISTRA-1627-v2

This brings in the fix for MAISTRA-1660.
@jwendell
Copy link
Member Author

All tests pass now. Turns out integration tests had an issue. Created MAISTRA-1660 for that.
Pulled in the fix for it from upstream 1.6 branch in this PR so that all tests pass and we have a single PR fixing all test/lint failures.

@jwendell jwendell requested a review from knrc July 16, 2020 12:43
@knrc
Copy link

knrc commented Jul 16, 2020

@jwendell This PR seems to include more than just lint and gen-check failures, can these be separated out into individual PRs?

@jwendell
Copy link
Member Author

no. If we split it, tests will fail for both PR's. Unless we force-merge them.

@knrc
Copy link

knrc commented Jul 16, 2020

@jwendell please create a second JIRA to cover the additional work and include it in the description of this PR, we should not be sneaking in additional changes just for expedience.

Copy link

@knrc knrc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requesting changes to cover additional commits included within this PR

@jwendell jwendell changed the title MAISTRA-1627: Fix lint and gen-check failures MAISTRA-1627, MAISTRA-1660: Fix lint, gen-check and integration test failures Jul 16, 2020
@jwendell
Copy link
Member Author

@knrc done

Copy link

@knrc knrc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jwendell thanks very much

@mergify mergify bot merged commit 26200b4 into maistra:maistra-2.0 Jul 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants