-
Notifications
You must be signed in to change notification settings - Fork 431
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
Consolidate e2e log collection #2345
Conversation
d7c8f56
to
22a83fa
Compare
@jsturtevant Is this ready for review or is it still WIP? Saw that there was a broken link in the tests. |
The other tests are passing, The folder structure isn't 100% the same so going to look into that but the general approach is ready for review. The broken link is to a file that is in this PR, so not sure how we handle that. It doesn't exist but when this gets published it would exist... |
You can use |
22a83fa
to
f45023e
Compare
Then we follow up with a separate PR to remove it? I feel that it would be better to merge knowing the check is only failing a link in that will be there once this merges but let me know what we typically do for this scenario. |
f45023e
to
becff43
Compare
/retitle Consolidate e2e log collection |
The folder structure for ci-entrypoint.sh is now the same as the ci-e2e.sh and ci-conformance.sh:
|
becff43
to
a202eb0
Compare
this is a chicken-and-egg problem... no matter what it will require a second PR if we want to job to pass on this PR. We can also ignore the linter and merge the PR with the failure but that's not ideal. |
Which approach is preferred? |
/test pull-cluster-api-provider-azure-e2e |
An alternative approach would be to open a stub PR including the just the file we are linking in the docs (assuming the file isn't going to produce compile errors without the rest being present). Then, you could rebase this PR off of that one. Otherwise, I would personally lean towards using the disable link check for now. |
a202eb0
to
ddbad26
Compare
test/logger.go
Outdated
// optional flags that default | ||
namespace := flag.String("namespace", "", "namespace on management cluster to collect logs for") | ||
artifactFolder := flag.String("artifacts-folder", getArtifactsFolder(), "folder to store cluster logs") | ||
azureresourcegroup := flag.String("azure-rg", "", "azure resource group that contains the cluster") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we really need to take the RG as input here or can we figure that out from the azure cluster spec?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I hadn't considered using the cluster spec, I will see if that can simplify adding an additional flag
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I fixed it at the place in the code where we are using an env variable instead of looking it up on the cluster spec
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
4e49bd9
to
3fe3425
Compare
08626ea
to
d0f78a6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/assign @mboersma
2dc2061
to
12855e3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
This is a great improvement! Thanks for addressing my ticky-tack comments.
/approve |
@CecileRobertMichon: once the present PR merges, I will cherry-pick it on top of release-1.3 in a new PR and assign it to you. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CecileRobertMichon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This failure seems to be coming from #2376 which is strange because it passed all tests before merging |
is it happening consistently and for other prs? /test pull-cluster-api-provider-azure-test |
hmm retest passed 🤔 I have not seen it on other PRs, but let's keep an 👁️ out. If it's non-deterministic that's an issue. |
@CecileRobertMichon: #2345 failed to apply on top of branch "release-1.3":
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
We have several different entry points for our CI and some of them use different logging scripts. This creates a binary that re-uses to the same logging as our conformance and e2e. It takes some basic configuration and runs the same logging functions used by the e2e_testsuite. An added benefit is that a user could also run this and collect logs that are the same as the e2e test.
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged):Fixes #1372
Special notes for your reviewer:
This required moving around some of the capz functions in the e2e test pacakge similiar to what was done in #2130
Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
TODOs:
Release note: