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

Skip TestFQDNCacheMinTTL if cluster has Windows Nodes. Fixes #6891 #6913

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

devc007
Copy link
Contributor

@devc007 devc007 commented Jan 9, 2025

No description provided.

Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

Please use a better commit message / PR title.
You are skipping TestFQDNCacheMinTTL here, not TestAntreaPolicy.

A good example would be:

Skip TestFQDNCacheMinTTL if cluster has Windows Nodes

The TestFQDNCacheMinTTL e2e test currently does not support Windows.
We skip it if any Node in the test cluster is a Windows Node, which is also
consistent with other AntreaPolicy e2e tests.

test/e2e/antreapolicy_test.go Outdated Show resolved Hide resolved
@antoninbas
Copy link
Contributor

Your commit message should also include Fixes #6891, so that the issue is automatically closed when we merge this PR.

@devc007
Copy link
Contributor Author

devc007 commented Jan 10, 2025

@antoninbas can i close this PR and then create a new fresh PR?

@antoninbas
Copy link
Contributor

@antoninbas can i close this PR and then create a new fresh PR?

It is not acceptable to open a new PR every time you want to make a change. It creates unnecessary noise and we lose all of the review history. Please read about PR-based development online. It is straightforward to update an existing PR with additional changes (rebase / commit / push).

Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

Please squash all commits so that your PR only has one commit, with the appropriate commit message and contents

t.Run("minTTLUnset", func(t *testing.T) { testWithFQDNCacheMinTTL(t, 0) })
t.Run("minTTL20s", func(t *testing.T) { testWithFQDNCacheMinTTL(t, 20) })
}

func testWithFQDNCacheMinTTL(t *testing.T, fqdnCacheMinTTL int) {

Copy link
Contributor

Choose a reason for hiding this comment

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

nit: remove extra empty line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@antoninbas pls have a look at new PR. Thanks for your patience.

@devc007 devc007 changed the title If windows node then TestAntreaPolicy will be skipped Skip TestFQDNCacheMinTTL if cluster has Windows Nodes. Fixes #6891 Jan 13, 2025
@antoninbas
Copy link
Contributor

/test-windows-e2e

@antoninbas
Copy link
Contributor

@devc007 The CI job that checks for code formatting is failing, please take a look. You can run it locally with make golangci.

@devc007
Copy link
Contributor Author

devc007 commented Jan 14, 2025

i have run it locally and it worked fine should i commit again?

@antoninbas
Copy link
Contributor

i have run it locally and it worked fine should i commit again?

https://github.com/antrea-io/antrea/actions/runs/12754960077/job/35553600585?pr=6913

After fixing the issue, yes you will need to commit again.
Running make golangci-fix takes care of basic issues automatically. You should run git diff afterwards to confirm what was changed, and then run commit / push again.

@antoninbas
Copy link
Contributor

@devc007 your commit is not signed, it is failing the DCO check

@wenyingd
Copy link
Contributor

/test-windows-e2e

1 similar comment
@XinShuYang
Copy link
Contributor

/test-windows-e2e

@antoninbas
Copy link
Contributor

@devc007 we are ready to merge this, but we cannot do it until you sign your commit

…o#6891

The TestFQDNCacheMinTTL e2e test currently does not support Windows.
We skip it if any Node in the test cluster is a Windows Node, which is also
consistent with other AntreaPolicy e2e tests.

Signed-off-by: devesh <[email protected]>
@wenyingd
Copy link
Contributor

/test-all
/test-windows-all

Copy link
Contributor

@wenyingd wenyingd left a comment

Choose a reason for hiding this comment

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

LGTM

@wenyingd
Copy link
Contributor

wenyingd commented Jan 23, 2025

@antoninbas Could we move forward this fix to unblock the Windows e2e failures on main branch?

@antoninbas
Copy link
Contributor

@wenyingd Did we get a successful run of jenkins-windows-e2e? It's showing as Pending for me right now.

@antoninbas
Copy link
Contributor

/test-windows-e2e

@wenyingd
Copy link
Contributor

wenyingd commented Jan 24, 2025

@wenyingd Did we get a successful run of jenkins-windows-e2e? It's showing as Pending for me right now.

Yes, windows-e2e for this PR used to succeed. Regarding the latest retry, it is still waiting in the queue now.

@wenyingd
Copy link
Contributor

/test-windows-e2e

@wenyingd
Copy link
Contributor

Provide a successful link for windows-e2e: http://10.164.243.223/view/Windows/job/antrea-windows-e2e-for-pull-request/91/

@antoninbas antoninbas merged commit ca8e0ee into antrea-io:main Jan 24, 2025
61 of 62 checks passed
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.

4 participants