Skip to content

Commit ac4798a

Browse files
Merge pull request #30902 from openshift-cherrypick-robot/cherry-pick-30872-to-release-4.21
[release-4.21] OCPBUGS-78780: changed http to https for three places to reduce test false positives and false negatives
2 parents 4753057 + 0b3e220 commit ac4798a

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

pkg/monitortests/testframework/disruptionexternalservicemonitoring/monitortest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const (
2020
newConnectionTestName = "[sig-trt] disruption/ci-cluster-network-liveness connection/new should be available throughout the test"
2121
reusedConnectionTestName = "[sig-trt] disruption/ci-cluster-network-liveness connection/reused should be available throughout the test"
2222

23-
externalServiceURL = "http://static.redhat.com/test/rhel-networkmanager.txt"
23+
externalServiceURL = "https://static.redhat.com/test/rhel-networkmanager.txt"
2424
)
2525

2626
type availability struct {

test/extended/machine_config/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func IsTwoNodeArbiter(oc *exutil.CLI) bool {
129129

130130
// `IsDisconnected` returns true if the cluster is a Disconnected cluster and false otherwise
131131
func IsDisconnected(oc *exutil.CLI, nodeName string) bool {
132-
networkStatus, _ := exutil.DebugNodeRetryWithOptionsAndChroot(oc, nodeName, "openshift-machine-config-operator", "sh", "-c", "curl -s --connect-timeout 5 http://fedoraproject.org/static/hotspot.txt &>/dev/null && echo \"Connected\" || echo \"Disconnected\"")
132+
networkStatus, _ := exutil.DebugNodeRetryWithOptionsAndChroot(oc, nodeName, "openshift-machine-config-operator", "sh", "-c", "curl -s --connect-timeout 5 https://fedoraproject.org/static/hotspot.txt &>/dev/null && echo \"Connected\" || echo \"Disconnected\"")
133133
if networkStatus == "Connected" {
134134
return false
135135
}

test/extended/networking/egress_firewall.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func sendEgressFwTraffic(f *e2e.Framework, mgmtFw *e2e.Framework, oc *exutil.CLI
183183
// Test curl to www.redhat.com should fail
184184
// because we don't have allow dns rule for www.redhat.com
185185
g.By("sending traffic that does not match allow dns rule")
186-
_, err = oc.Run("exec").Args(pod, "--", "curl", "-q", "-s", "-I", "-m5", "http://www.redhat.com").Output()
186+
_, err = oc.Run("exec").Args(pod, "--", "curl", "-q", "-s", "-I", "-m5", "https://www.redhat.com").Output()
187187
expectError(err)
188188

189189
if nodeSelectorSupport {

0 commit comments

Comments
 (0)