Remove {PROMETHEUS,LOKI}_PORT vars from sceenarios

pmtk · pmtk · commit 868dc318904a · 2025-11-27T12:34:30.000+01:00
diff --git a/test/scenarios-bootc/periodics/el100-src@optional.sh b/test/scenarios-bootc/periodics/el100-src@optional.sh
@@ -27,9 +27,6 @@ scenario_remove_vms() {
 scenario_run_tests() {
     run_tests host1 \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9092" \
         --variable "LOKI_HOST:$(hostname)" \
-        --variable "LOKI_PORT:3200" \
-        --variable "PROM_EXPORTER_PORT:8889" \
         suites/optional/
 }
diff --git a/test/scenarios-bootc/periodics/el96-src@gitops-telemetry-clusterid-systemd.sh b/test/scenarios-bootc/periodics/el96-src@gitops-telemetry-clusterid-systemd.sh
@@ -16,7 +16,6 @@ scenario_run_tests() {
         --variable "PROXY_HOST:${VM_BRIDGE_IP}" \
         --variable "PROXY_PORT:9001" \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9093" \
         suites/gitops/ \
         suites/telemetry/telemetry.robot \
         suites/osconfig/clusterid.robot \
diff --git a/test/scenarios-bootc/presubmits/el96-src@optional.sh b/test/scenarios-bootc/presubmits/el96-src@optional.sh
@@ -27,9 +27,6 @@ scenario_remove_vms() {
 scenario_run_tests() {
         run_tests host1 \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9092" \
         --variable "LOKI_HOST:$(hostname)" \
-        --variable "LOKI_PORT:3200" \
-        --variable "PROM_EXPORTER_PORT:8889" \
         suites/optional/
 }
diff --git a/test/scenarios-bootc/releases/el96-lrel@optional.sh b/test/scenarios-bootc/releases/el96-lrel@optional.sh
@@ -28,9 +28,6 @@ scenario_run_tests() {
 
     run_tests host1 \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9092" \
         --variable "LOKI_HOST:$(hostname)" \
-        --variable "LOKI_PORT:3200" \
-        --variable "PROM_EXPORTER_PORT:8889" \
         suites/optional/
 }
diff --git a/test/scenarios-bootc/releases/el96-lrel@telemetry.sh b/test/scenarios-bootc/releases/el96-lrel@telemetry.sh
@@ -24,6 +24,5 @@ scenario_run_tests() {
         --variable "PROXY_HOST:${VM_BRIDGE_IP}" \
         --variable "PROXY_PORT:9001" \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9093" \
         suites/telemetry/telemetry.robot
 }
diff --git a/test/scenarios-bootc/upstream/cos10-src@optional.sh b/test/scenarios-bootc/upstream/cos10-src@optional.sh
@@ -27,9 +27,6 @@ scenario_remove_vms() {
 scenario_run_tests() {
     run_tests host1 \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9093" \
         --variable "LOKI_HOST:$(hostname)" \
-        --variable "LOKI_PORT:3201" \
-        --variable "PROM_EXPORTER_PORT:8889" \
         suites/optional/
 }
diff --git a/test/scenarios-bootc/upstream/cos9-src@optional.sh b/test/scenarios-bootc/upstream/cos9-src@optional.sh
@@ -27,9 +27,6 @@ scenario_remove_vms() {
 scenario_run_tests() {
     run_tests host1 \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9092" \
         --variable "LOKI_HOST:$(hostname)" \
-        --variable "LOKI_PORT:3200" \
-        --variable "PROM_EXPORTER_PORT:8889" \
         suites/optional/
 }
diff --git a/test/scenarios/periodics/el96-src@optional.sh b/test/scenarios/periodics/el96-src@optional.sh
@@ -34,10 +34,7 @@ scenario_run_tests() {
         # GDP suite is tested with bootc images instead.
         run_tests host1 \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9092" \
         --variable "LOKI_HOST:$(hostname)" \
-        --variable "LOKI_PORT:3200" \
-        --variable "PROM_EXPORTER_PORT:8889" \
         --exclude generic-device-plugin \
         suites/optional/
 }
diff --git a/test/scenarios/releases/el96-lrel@optional.sh b/test/scenarios/releases/el96-lrel@optional.sh
@@ -35,10 +35,7 @@ scenario_run_tests() {
     # GDP suite is tested with bootc images instead.
     run_tests host1 \
         --variable "PROMETHEUS_HOST:$(hostname)" \
-        --variable "PROMETHEUS_PORT:9092" \
         --variable "LOKI_HOST:$(hostname)" \
-        --variable "LOKI_PORT:3200" \
-        --variable "PROM_EXPORTER_PORT:8889" \
         --exclude generic-device-plugin \
         suites/optional/
 }

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,6 @@ scenario_run_tests() {`
`28`	`28`
`29`	`29`	`run_tests host1 \`
`30`	`30`	`--variable "PROMETHEUS_HOST:$(hostname)" \`
`31`		`- --variable "PROMETHEUS_PORT:9092" \`
`32`	`31`	`--variable "LOKI_HOST:$(hostname)" \`
`33`		`- --variable "LOKI_PORT:3200" \`
`34`		`- --variable "PROM_EXPORTER_PORT:8889" \`
`35`	`32`	`suites/optional/`
`36`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,5 @@ scenario_run_tests() {`
`24`	`24`	`--variable "PROXY_HOST:${VM_BRIDGE_IP}" \`
`25`	`25`	`--variable "PROXY_PORT:9001" \`
`26`	`26`	`--variable "PROMETHEUS_HOST:$(hostname)" \`
`27`		`- --variable "PROMETHEUS_PORT:9093" \`
`28`	`27`	`suites/telemetry/telemetry.robot`
`29`	`28`	`}`