Skip to content

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Jul 15, 2025

What type of PR is this?
/kind bug

What this PR does / why we need it:

The ipv6 conformance job has been effectively equivalent to the regular conformance job because the job is configured to set IP_FAMILY to ipv6 but the test is expecting IPv6 to switch the template and e2e config. Other uses of IP_FAMILY that I can find all use ipv6, so this PR updates the test to look for that value.

https://github.com/kubernetes/test-infra/blob/6ff24f80fad13b8a2f8b3a19a00e717c46964fee/config/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presubmits-main.yaml#L395-L396

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 #

Special notes for your reviewer:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests
  • cherry-pick candidate

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. labels Jul 15, 2025
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 15, 2025
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 15, 2025
Copy link

codecov bot commented Jul 16, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.82%. Comparing base (5ae25f7) to head (2cccc8d).
Report is 4 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5755   +/-   ##
=======================================
  Coverage   52.81%   52.82%           
=======================================
  Files         279      279           
  Lines       29629    29629           
=======================================
+ Hits        15650    15652    +2     
+ Misses      13162    13160    -2     
  Partials      817      817           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 16, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: bb4b030af25b3019017bca5322399a771a00cca9

Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboersma

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 16, 2025
@k8s-ci-robot k8s-ci-robot merged commit 71bd7f1 into kubernetes-sigs:main Jul 16, 2025
30 of 31 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jul 16, 2025
@github-project-automation github-project-automation bot moved this from Todo to Done in CAPZ Planning Jul 16, 2025
@mboersma
Copy link
Contributor

/cherry-pick release-1.20

@mboersma
Copy link
Contributor

/cherry-pick release-1.19

@k8s-infra-cherrypick-robot

@mboersma: new pull request created: #5760

In response to this:

/cherry-pick release-1.20

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-sigs/prow repository.

@k8s-infra-cherrypick-robot

@mboersma: #5755 failed to apply on top of branch "release-1.19":

Applying: Use ipv6 template for ipv6 conformance instead of default template
Using index info to reconstruct a base tree...
M	docs/book/src/developers/development.md
M	test/e2e/config/azure-dev.yaml
M	test/e2e/conformance_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/conformance_test.go
CONFLICT (content): Merge conflict in test/e2e/conformance_test.go
Auto-merging test/e2e/config/azure-dev.yaml
CONFLICT (content): Merge conflict in test/e2e/config/azure-dev.yaml
Auto-merging docs/book/src/developers/development.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Use ipv6 template for ipv6 conformance instead of default template

In response to this:

/cherry-pick release-1.19

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants