Skip to content

[release-4.18] OCPBUGS-58366: Make EgressIP helper functions more reliable #29950

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jul 7, 2025
Merged

[release-4.18] OCPBUGS-58366: Make EgressIP helper functions more reliable #29950

merged 1 commit into from
Jul 7, 2025
+49 −49

Conversation

@pliurh
Copy link
Contributor

@pliurh pliurh commented Jul 2, 2025 •
edited
Loading

This is manual cherry-pick from 4.19 branch. The original commit is part of PR #29777. We don't support route advertisements feature in 4.18. Therefore, the commits for route advertisements feature are dropped.

Fixed the following conflicts manually.

diff --cc test/extended/networking/egressip_helpers.go
index e6da27d8c9,3f5c21e9f3..0000000000
--- a/test/extended/networking/egressip_helpers.go
+++ b/test/extended/networking/egressip_helpers.go
@@@ -432,9 -434,8 +432,14 @@@ func createPacketSnifferDaemonSet(oc *e
  const (
        // The tcpCaptureScript runs tcpdump and extracts all GET request strings from the packets.
        // The resulting lines will be something like:
++<<<<<<< HEAD
 +      // 10.128.2.15.36749  /f8f721fa-53c9-444f-bc96-69c7388fcb5a
 +      tcpCaptureScript = `#!/bin/bash
 +tcpdump -nne -i %s -l -s 0  'port %d and tcp[((tcp[12:1] & 0xf0) >> 2):4] = 0x47455420' | awk '{print $10 " " $(NF-1)}'
++=======
+       // Parsed 05:38:34.307832 10.128.2.15.36749  /f8f721fa-53c9-444f-bc96-69c7388fcb5a
+       tcpCaptureScript = `tcpdump -nn -i %s -l -s 0 -A 'tcp and port %d' | awk 'match($0,/IP6?[[:space:]]+([0-9a-fA-F:\.]+[0-9a-fA-F])/,arr) {ts=$1; ip=arr[1]} $0 !~ /HTTP.*GET/ && match($0,/GET[[:space:]]+([^[:space:]]+)/,arr) {print "Parsed", ts, ip, arr[1]} // {print $0}'
++>>>>>>> df3726412a (Make EgressIP helper functions more reliable)
  `
  
        // The udpCaptureScript runs tcpdump with option -xx and then decodes the hexadecimal information.
@@@ -1271,13 -1271,14 +1275,19 @@@ func sendProbesToHostPort(oc *exutil.CL
        request := fmt.Sprintf("http://%s/dial?protocol=%s&host=%s&port=%d&request=%s", url, targetProtocol, targetHost, targetPort, randomIDStr)
        var wg sync.WaitGroup
        errChan := make(chan error, iterations)
+ 
        for i := 0; i < iterations; i++ {
                // Make sure that we don´t reuse the i variable when passing it to the go func.
-               i := i
+               interval := i
                // Randomize the start time a little bit per go routine.
                // Max of 250 ms * current iteration counter
++<<<<<<< HEAD
 +              n := rand.Intn(250) * i
 +              framework.Logf("Sleeping for %d ms for iteration %d", n, i)
++=======
+               n := rand.Intn(250) * interval
+               framework.Logf("Sleeping for %d ms for iteration %d", n, interval)
++>>>>>>> df3726412a (Make EgressIP helper functions more reliable)
                wg.Add(1)
                go func() {
                        defer wg.Done()

Parse tcpdump output based on regex instead of position.

Send probe requests with a sequence number for debgging.

Use ClusterIP instead of route as the prober target.

(cherry picked from commit df37264)

@pliurh
Make EgressIP helper functions more reliable
79b1570 
Parse tcpdump output based on regex instead of position.

Send probe requests with a sequence number for debgging.

Use ClusterIP instead of route as the prober target.

Signed-off-by: Peng Liu <[email protected]>
(cherry picked from commit df37264)
@pliurh
Copy link
Contributor Author

pliurh commented Jul 2, 2025

/pj-rehearse

@openshift-ci openshift-ci bot requested review from danwinship and knobunc July 2, 2025 06:40
@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 2, 2025

/testwith openshift/ovn-kubernetes/master/e2e-aws-ovn-edge-zones openshift/ovn-kubernetes#2646

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 2, 2025

@jluhrsen, testwith: could not generate prow job. ERROR:

No ref for requested test included in command. The org, repo, and branch containing the requested test need to be targeted by at least one of the included PRs.

@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 2, 2025

/testwith openshift/ovn-kubernetes/master/e2e-aws-ovn-edge-zones openshift/ovn-kubernetes#2646

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 2, 2025

@jluhrsen, testwith: could not generate prow job. ERROR:

No ref for requested test included in command. The org, repo, and branch containing the requested test need to be targeted by at least one of the included PRs.

@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 2, 2025

/testwith openshift/ovn-kubernetes/release-4.18/e2e-aws-ovn-edge-zones openshift/ovn-kubernetes#2646

@tssurya
Copy link
Contributor

tssurya commented Jul 2, 2025

/testwith openshift/ovn-kubernetes/release-4.18/e2e-aws-ovn-edge-zones openshift/ovn-kubernetes#2646

its not that its #29891

@jluhrsen jluhrsen mentioned this pull request Jul 2, 2025
Merged
5 tasks
@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 2, 2025

/testwith openshift/ovn-kubernetes/release-4.18/e2e-aws-ovn-edge-zones openshift/ovn-kubernetes#2646

its not that its #29891

yeah, that's in addition to this one (you just informed me), but these origin PRs are what we need to testwith the 4.18 sync PR which is what I was trying to do here and it's not working. *sigh

@tssurya
Copy link
Contributor

tssurya commented Jul 2, 2025

/testwith openshift/ovn-kubernetes/release-4.18/e2e-aws-ovn-edge-zones openshift/ovn-kubernetes#2646

its not that its #29891

yeah, that's in addition to this one (you just informed me), but these origin PRs are what we need to testwith the 4.18 sync PR which is what I was trying to do here and it's not working. *sigh

oh I see :( I think that zone one should hopefully be fixed with 29891.. good luck with other stuff you are chasing

@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 3, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2025
@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 3, 2025

/retitle [release-4.18] OCPBUGS-58366: Make EgressIP helper functions more reliable

@openshift-ci openshift-ci bot changed the title [4.18] Make EgressIP helper functions more reliable [release-4.18] OCPBUGS-58366: Make EgressIP helper functions more reliable Jul 3, 2025
@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 3, 2025

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jul 3, 2025
@openshift-ci-robot
Copy link

@pliurh: This pull request references Jira Issue OCPBUGS-58366, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-56000 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-56000 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is manual cherry-pick from 4.19 branch. The original commit is part of PR #29777. We don't support route advertisements feature in 4.18. Therefore, the commits for route advertisements feature are dropped.

Fixed the following conflicts manually.

diff --cc test/extended/networking/egressip_helpers.go
index e6da27d8c9,3f5c21e9f3..0000000000
--- a/test/extended/networking/egressip_helpers.go
+++ b/test/extended/networking/egressip_helpers.go
@@@ -432,9 -434,8 +432,14 @@@ func createPacketSnifferDaemonSet(oc *e
 const (
       // The tcpCaptureScript runs tcpdump and extracts all GET request strings from the packets.
       // The resulting lines will be something like:
++<<<<<<< HEAD
+      // 10.128.2.15.36749  /f8f721fa-53c9-444f-bc96-69c7388fcb5a
+      tcpCaptureScript = `#!/bin/bash
+tcpdump -nne -i %s -l -s 0  'port %d and tcp[((tcp[12:1] & 0xf0) >> 2):4] = 0x47455420' | awk '{print $10 " " $(NF-1)}'
++=======
+       // Parsed 05:38:34.307832 10.128.2.15.36749  /f8f721fa-53c9-444f-bc96-69c7388fcb5a
+       tcpCaptureScript = `tcpdump -nn -i %s -l -s 0 -A 'tcp and port %d' | awk 'match($0,/IP6?[[:space:]]+([0-9a-fA-F:\.]+[0-9a-fA-F])/,arr) {ts=$1; ip=arr[1]} $0 !~ /HTTP.*GET/ && match($0,/GET[[:space:]]+([^[:space:]]+)/,arr) {print "Parsed", ts, ip, arr[1]} // {print $0}'
++>>>>>>> df3726412a (Make EgressIP helper functions more reliable)
 `
 
       // The udpCaptureScript runs tcpdump with option -xx and then decodes the hexadecimal information.
@@@ -1271,13 -1271,14 +1275,19 @@@ func sendProbesToHostPort(oc *exutil.CL
       request := fmt.Sprintf("http://%s/dial?protocol=%s&host=%s&port=%d&request=%s", url, targetProtocol, targetHost, targetPort, randomIDStr)
       var wg sync.WaitGroup
       errChan := make(chan error, iterations)
+ 
       for i := 0; i < iterations; i++ {
               // Make sure that we don´t reuse the i variable when passing it to the go func.
-               i := i
+               interval := i
               // Randomize the start time a little bit per go routine.
               // Max of 250 ms * current iteration counter
++<<<<<<< HEAD
+              n := rand.Intn(250) * i
+              framework.Logf("Sleeping for %d ms for iteration %d", n, i)
++=======
+               n := rand.Intn(250) * interval
+               framework.Logf("Sleeping for %d ms for iteration %d", n, interval)
++>>>>>>> df3726412a (Make EgressIP helper functions more reliable)
               wg.Add(1)
               go func() {
                       defer wg.Done()

Parse tcpdump output based on regex instead of position.

Send probe requests with a sequence number for debgging.

Use ClusterIP instead of route as the prober target.

(cherry picked from commit df37264)

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

@jluhrsen: This pull request references Jira Issue OCPBUGS-58366, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-56000 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-56000 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from anuragthehatter July 3, 2025 15:26
@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 3, 2025

/retest

@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 3, 2025

@neisw , could you PTAL at this? asking since you approved the 4.19 version of this.

@pliurh
Copy link
Contributor Author

pliurh commented Jul 4, 2025

/test ci/prow/e2e-aws-ovn-serial

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 4, 2025

@pliurh: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aws-jenkins

/test e2e-aws-ovn-edge-zones

/test e2e-aws-ovn-fips

/test e2e-aws-ovn-image-registry

/test e2e-aws-ovn-microshift

/test e2e-aws-ovn-microshift-serial

/test e2e-aws-ovn-serial

/test e2e-gcp-ovn

/test e2e-gcp-ovn-builds

/test e2e-gcp-ovn-image-ecosystem

/test e2e-gcp-ovn-upgrade

/test e2e-metal-ipi-ovn-ipv6

/test images

/test lint

/test unit

/test verify

/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-agnostic-ovn-cmd

/test e2e-aws

/test e2e-aws-csi

/test e2e-aws-disruptive

/test e2e-aws-etcd-certrotation

/test e2e-aws-etcd-recovery

/test e2e-aws-ovn

/test e2e-aws-ovn-cgroupsv2

/test e2e-aws-ovn-etcd-scaling

/test e2e-aws-ovn-kube-apiserver-rollout

/test e2e-aws-ovn-kubevirt

/test e2e-aws-ovn-serial-ipsec

/test e2e-aws-ovn-single-node

/test e2e-aws-ovn-single-node-serial

/test e2e-aws-ovn-single-node-techpreview

/test e2e-aws-ovn-single-node-techpreview-serial

/test e2e-aws-ovn-single-node-upgrade

/test e2e-aws-ovn-upgrade

/test e2e-aws-ovn-upgrade-rollback

/test e2e-aws-ovn-upi

/test e2e-aws-ovn-virt-techpreview

/test e2e-aws-proxy

/test e2e-azure

/test e2e-azure-ovn-etcd-scaling

/test e2e-azure-ovn-upgrade

/test e2e-baremetalds-kubevirt

/test e2e-external-aws

/test e2e-external-aws-ccm

/test e2e-external-vsphere-ccm

/test e2e-gcp-csi

/test e2e-gcp-disruptive

/test e2e-gcp-fips-serial

/test e2e-gcp-ovn-etcd-scaling

/test e2e-gcp-ovn-rt-upgrade

/test e2e-gcp-ovn-techpreview

/test e2e-gcp-ovn-techpreview-serial

/test e2e-metal-ipi-ovn

/test e2e-metal-ipi-ovn-dualstack

/test e2e-metal-ipi-ovn-dualstack-bgp-local-gw-techpreview

/test e2e-metal-ipi-ovn-dualstack-bgp-techpreview

/test e2e-metal-ipi-ovn-dualstack-local-gateway

/test e2e-metal-ipi-ovn-kube-apiserver-rollout

/test e2e-metal-ipi-serial

/test e2e-metal-ipi-serial-ovn-ipv6

/test e2e-metal-ipi-virtualmedia

/test e2e-metal-ovn-single-node-live-iso

/test e2e-metal-ovn-single-node-with-worker-live-iso

/test e2e-openstack-ovn

/test e2e-openstack-serial

/test e2e-vsphere

/test e2e-vsphere-ovn-dualstack-primaryv6

/test e2e-vsphere-ovn-etcd-scaling

/test okd-scos-e2e-aws-ovn

/test okd-scos-images

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-origin-release-4.18-e2e-agnostic-ovn-cmd

pull-ci-openshift-origin-release-4.18-e2e-aws-csi

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-cgroupsv2

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-edge-zones

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-fips

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-kube-apiserver-rollout

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-microshift

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-microshift-serial

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-serial

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node-serial

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node-upgrade

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-upgrade

pull-ci-openshift-origin-release-4.18-e2e-gcp-csi

pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn

pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn-rt-upgrade

pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn-upgrade

pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn

pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn-ipv6

pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn-kube-apiserver-rollout

pull-ci-openshift-origin-release-4.18-e2e-openstack-ovn

pull-ci-openshift-origin-release-4.18-images

pull-ci-openshift-origin-release-4.18-lint

pull-ci-openshift-origin-release-4.18-okd-scos-e2e-aws-ovn

pull-ci-openshift-origin-release-4.18-unit

pull-ci-openshift-origin-release-4.18-verify

pull-ci-openshift-origin-release-4.18-verify-deps

In response to this:

/test ci/prow/e2e-aws-ovn-serial

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.

@pliurh
Copy link
Contributor Author

pliurh commented Jul 4, 2025

/retest ci/prow/e2e-aws-ovn-serial

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 4, 2025

@pliurh: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

/test e2e-aws-jenkins

/test e2e-aws-ovn-edge-zones

/test e2e-aws-ovn-fips

/test e2e-aws-ovn-image-registry

/test e2e-aws-ovn-microshift

/test e2e-aws-ovn-microshift-serial

/test e2e-aws-ovn-serial

/test e2e-gcp-ovn

/test e2e-gcp-ovn-builds

/test e2e-gcp-ovn-image-ecosystem

/test e2e-gcp-ovn-upgrade

/test e2e-metal-ipi-ovn-ipv6

/test images

/test lint

/test unit

/test verify

/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-agnostic-ovn-cmd

/test e2e-aws

/test e2e-aws-csi

/test e2e-aws-disruptive

/test e2e-aws-etcd-certrotation

/test e2e-aws-etcd-recovery

/test e2e-aws-ovn

/test e2e-aws-ovn-cgroupsv2

/test e2e-aws-ovn-etcd-scaling

/test e2e-aws-ovn-kube-apiserver-rollout

/test e2e-aws-ovn-kubevirt

/test e2e-aws-ovn-serial-ipsec

/test e2e-aws-ovn-single-node

/test e2e-aws-ovn-single-node-serial

/test e2e-aws-ovn-single-node-techpreview

/test e2e-aws-ovn-single-node-techpreview-serial

/test e2e-aws-ovn-single-node-upgrade

/test e2e-aws-ovn-upgrade

/test e2e-aws-ovn-upgrade-rollback

/test e2e-aws-ovn-upi

/test e2e-aws-ovn-virt-techpreview

/test e2e-aws-proxy

/test e2e-azure

/test e2e-azure-ovn-etcd-scaling

/test e2e-azure-ovn-upgrade

/test e2e-baremetalds-kubevirt

/test e2e-external-aws

/test e2e-external-aws-ccm

/test e2e-external-vsphere-ccm

/test e2e-gcp-csi

/test e2e-gcp-disruptive

/test e2e-gcp-fips-serial

/test e2e-gcp-ovn-etcd-scaling

/test e2e-gcp-ovn-rt-upgrade

/test e2e-gcp-ovn-techpreview

/test e2e-gcp-ovn-techpreview-serial

/test e2e-metal-ipi-ovn

/test e2e-metal-ipi-ovn-dualstack

/test e2e-metal-ipi-ovn-dualstack-bgp-local-gw-techpreview

/test e2e-metal-ipi-ovn-dualstack-bgp-techpreview

/test e2e-metal-ipi-ovn-dualstack-local-gateway

/test e2e-metal-ipi-ovn-kube-apiserver-rollout

/test e2e-metal-ipi-serial

/test e2e-metal-ipi-serial-ovn-ipv6

/test e2e-metal-ipi-virtualmedia

/test e2e-metal-ovn-single-node-live-iso

/test e2e-metal-ovn-single-node-with-worker-live-iso

/test e2e-openstack-ovn

/test e2e-openstack-serial

/test e2e-vsphere

/test e2e-vsphere-ovn-dualstack-primaryv6

/test e2e-vsphere-ovn-etcd-scaling

/test okd-scos-e2e-aws-ovn

/test okd-scos-images

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-origin-release-4.18-e2e-agnostic-ovn-cmd

pull-ci-openshift-origin-release-4.18-e2e-aws-csi

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-cgroupsv2

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-edge-zones

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-fips

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-kube-apiserver-rollout

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-microshift

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-microshift-serial

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-serial

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node-serial

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-single-node-upgrade

pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-upgrade

pull-ci-openshift-origin-release-4.18-e2e-gcp-csi

pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn

pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn-rt-upgrade

pull-ci-openshift-origin-release-4.18-e2e-gcp-ovn-upgrade

pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn

pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn-ipv6

pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn-kube-apiserver-rollout

pull-ci-openshift-origin-release-4.18-e2e-openstack-ovn

pull-ci-openshift-origin-release-4.18-images

pull-ci-openshift-origin-release-4.18-lint

pull-ci-openshift-origin-release-4.18-okd-scos-e2e-aws-ovn

pull-ci-openshift-origin-release-4.18-unit

pull-ci-openshift-origin-release-4.18-verify

pull-ci-openshift-origin-release-4.18-verify-deps

In response to this:

/retest ci/prow/e2e-aws-ovn-serial

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.

@pliurh
Copy link
Contributor Author

pliurh commented Jul 4, 2025

/test e2e-aws-ovn-serial

@pliurh
Copy link
Contributor Author

pliurh commented Jul 4, 2025

/hold

We shall ensure all EgressIP tests can pass in the e2e-aws-ovn-single-node-serial job.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2025
@pliurh
Copy link
Contributor Author

pliurh commented Jul 4, 2025

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2025
@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 5, 2025

/retest

@jluhrsen
Copy link
Contributor

jluhrsen commented Jul 5, 2025

/testwith openshift/ovn-kubernetes/release-4.18/e2e-aws-ovn-edge-zones openshift/ovn-kubernetes#2646

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 5, 2025

@pliurh: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-ovn-kube-apiserver-rollout 79b1570 link false /test e2e-aws-ovn-kube-apiserver-rollout
ci/prow/okd-scos-e2e-aws-ovn 79b1570 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-aws-ovn-single-node-serial 79b1570 link false /test e2e-aws-ovn-single-node-serial

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@neisw
Copy link
Contributor

neisw commented Jul 7, 2025

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 7, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jluhrsen, neisw, pliurh

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 7, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 4a531db into openshift:release-4.18 Jul 7, 2025
25 of 29 checks passed
@openshift-ci-robot
Copy link

@pliurh: Jira Issue OCPBUGS-58366: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-58366 has been moved to the MODIFIED state.

In response to this:

This is manual cherry-pick from 4.19 branch. The original commit is part of PR #29777. We don't support route advertisements feature in 4.18. Therefore, the commits for route advertisements feature are dropped.

Fixed the following conflicts manually.

diff --cc test/extended/networking/egressip_helpers.go
index e6da27d8c9,3f5c21e9f3..0000000000
--- a/test/extended/networking/egressip_helpers.go
+++ b/test/extended/networking/egressip_helpers.go
@@@ -432,9 -434,8 +432,14 @@@ func createPacketSnifferDaemonSet(oc *e
 const (
       // The tcpCaptureScript runs tcpdump and extracts all GET request strings from the packets.
       // The resulting lines will be something like:
++<<<<<<< HEAD
+      // 10.128.2.15.36749  /f8f721fa-53c9-444f-bc96-69c7388fcb5a
+      tcpCaptureScript = `#!/bin/bash
+tcpdump -nne -i %s -l -s 0  'port %d and tcp[((tcp[12:1] & 0xf0) >> 2):4] = 0x47455420' | awk '{print $10 " " $(NF-1)}'
++=======
+       // Parsed 05:38:34.307832 10.128.2.15.36749  /f8f721fa-53c9-444f-bc96-69c7388fcb5a
+       tcpCaptureScript = `tcpdump -nn -i %s -l -s 0 -A 'tcp and port %d' | awk 'match($0,/IP6?[[:space:]]+([0-9a-fA-F:\.]+[0-9a-fA-F])/,arr) {ts=$1; ip=arr[1]} $0 !~ /HTTP.*GET/ && match($0,/GET[[:space:]]+([^[:space:]]+)/,arr) {print "Parsed", ts, ip, arr[1]} // {print $0}'
++>>>>>>> df3726412a (Make EgressIP helper functions more reliable)
 `
 
       // The udpCaptureScript runs tcpdump with option -xx and then decodes the hexadecimal information.
@@@ -1271,13 -1271,14 +1275,19 @@@ func sendProbesToHostPort(oc *exutil.CL
       request := fmt.Sprintf("http://%s/dial?protocol=%s&host=%s&port=%d&request=%s", url, targetProtocol, targetHost, targetPort, randomIDStr)
       var wg sync.WaitGroup
       errChan := make(chan error, iterations)
+ 
       for i := 0; i < iterations; i++ {
               // Make sure that we don´t reuse the i variable when passing it to the go func.
-               i := i
+               interval := i
               // Randomize the start time a little bit per go routine.
               // Max of 250 ms * current iteration counter
++<<<<<<< HEAD
+              n := rand.Intn(250) * i
+              framework.Logf("Sleeping for %d ms for iteration %d", n, i)
++=======
+               n := rand.Intn(250) * interval
+               framework.Logf("Sleeping for %d ms for iteration %d", n, interval)
++>>>>>>> df3726412a (Make EgressIP helper functions more reliable)
               wg.Add(1)
               go func() {
                       defer wg.Done()

Parse tcpdump output based on regex instead of position.

Send probe requests with a sequence number for debgging.

Use ClusterIP instead of route as the prober target.

(cherry picked from commit df37264)

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-tests
This PR has been included in build openshift-enterprise-tests-container-v4.18.0-202507071104.p0.g4a531db.assembly.stream.el9.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.18.0-0.nightly-2025-07-10-031259

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@danwinship danwinship Awaiting requested review from danwinship

@knobunc knobunc Awaiting requested review from knobunc

@anuragthehatter anuragthehatter Awaiting requested review from anuragthehatter

Assignees

@jluhrsen jluhrsen

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@pliurh @jluhrsen @tssurya @openshift-ci-robot @neisw @openshift-bot @openshift-merge-robot