Remove keywords to start/stop prom/loki

Author: pmtk

test/resources/observability.resource

@@ -1,24 +1,8 @@
 *** Settings ***
-Documentation       Keywords common to observability test suites
+Documentation       Variables common to observability test suites
 
 
-*** Keywords ***
-Start Prometheus Server
-    [Documentation]    Start a Prometheus Server on port 9092
-    [Arguments]    ${port}=9092
-    Local Command Should Work    bash -x ./bin/manage_prometheus.sh start ${port}
-
-Stop Prometheus Server
-    [Documentation]    Stop the Prometheus Server
-    [Arguments]    ${port}=9092
-    Local Command Should Work    bash -x ./bin/manage_prometheus.sh stop ${port}
-
-Start Loki Server
-    [Documentation]    Start a Loki Server on port 3100
-    [Arguments]    ${port}=3100
-    Local Command Should Work    bash -x ./bin/manage_loki.sh start ${port}
-
-Stop Loki Server
-    [Documentation]    Stop the Loki Server
-    [Arguments]    ${port}=3100
-    Local Command Should Work    bash -x ./bin/manage_loki.sh stop ${port}
+*** Variables ***
+${PROMETHEUS_PORT}          9090
+${LOKI_PORT}                3100
+${PROM_EXPORTER_PORT}       8889

test/suites/optional/observability.robot

@@ -65,8 +65,6 @@ Logs Should Not Contain Receiver Errors
 Setup Suite And Prepare Test Host
     [Documentation]    The service starts after MicroShift starts and thus will start generating pertinent log data
     ...    right away. When the suite is executed, immediately get the cursor for the microshift-observability unit.
-    Start Prometheus Server    ${PROMETHEUS_PORT}
-    Start Loki Server    ${LOKI_PORT}
     Setup Suite
     Check Required Observability Variables
     Set Test OTEL Configuration
@@ -79,10 +77,8 @@ Check Required Observability Variables
     ${string_value}    Convert To String    ${PROMETHEUS_PORT}
     Should Not Be Empty    ${string_value}    PROMETHEUS_PORT variable is required
     Should Not Be Empty    ${LOKI_HOST}    LOKI_HOST variable is required
-    ${string_value}    Convert To String    ${LOKI_PORT}
-    Should Not Be Empty    ${string_value}    LOKI_PORT variable is required
-    ${string_value}    Convert To String    ${PROM_EXPORTER_PORT}
-    Should Not Be Empty    ${string_value}    PROM_EXPORTER_PORT variable is required
+    ${string_value}    Convert To String    ${LOKI_HOST}
+    Should Not Be Empty    ${string_value}    LOKI_HOST variable is required
 
 Set Test OTEL Configuration
     [Documentation]    Set Test OTEL Configuration
@@ -98,8 +94,6 @@ Teardown Suite And Revert Test Host
     [Documentation]    Set back original OTEL config and teardown Suite
     Set Back Original OTEL Configuration
     Teardown Suite
-    Stop Loki Server    ${LOKI_PORT}
-    Stop Prometheus Server    ${PROMETHEUS_PORT}
 
 Set Back Original OTEL Configuration
     [Documentation]    Set Back Original OTEL Configuration

test/suites/telemetry/telemetry.robot

@@ -20,7 +20,6 @@ Test Tags           restart    slow
 ${PROXY_HOST}                           ${EMPTY}
 ${PROXY_PORT}                           ${EMPTY}
 ${PROMETHEUS_HOST}                      ${EMPTY}
-${PROMETHEUS_PORT}                      ${EMPTY}
 ${TELEMETRY_WRITE_ENDPOINT}             https://infogw.api.openshift.com/metrics/v1/receive
 ${PROXY_ENDPOINT}                       http://${PROXY_HOST}:${PROXY_PORT}/api/v1/write
 ${ENABLE_TELEMETRY}                     SEPARATOR=\n
@@ -71,14 +70,12 @@ MicroShift Reports Metrics To Default Server Through Proxy
 
 MicroShift Fails to Report Metrics To Prometheus Server With Telemetry Disabled
     [Documentation]    Check MicroShift is not able to send metrics to the telemetry server when it is disabled.
-    [Setup]    Run Keywords
-    ...    Setup Telemetry Configuration    ${DISABLE_TELEMETRY_TO_PROMETHEUS}    ${PULL_SECRET_METRICS}
+    [Setup]    Setup Telemetry Configuration    ${DISABLE_TELEMETRY_TO_PROMETHEUS}    ${PULL_SECRET_METRICS}
 
     Should Find Metrics In Journal Log Success    Telemetry is disabled
     Should Find Metrics In Journal Log Fails    Metrics sent successfully
 
-    [Teardown]    Run Keywords
-    ...    Remove Telemetry Configuration
+    [Teardown]    Remove Telemetry Configuration
 
 MicroShift Fails to Report Metrics To Default Server With Wrong Pull Secret
     [Documentation]    Check MicroShift is not able to send metrics to the telemetry server when the pull secret is wrong.
@@ -91,10 +88,7 @@ MicroShift Fails to Report Metrics To Default Server With Wrong Pull Secret
 
 MicroShift Reports Metrics To Prometheus Server
     [Documentation]    Check the expected metrics are sent to the local server.
-    [Setup]    Run Keywords
-    ...    Start Prometheus Server    ${PROMETHEUS_PORT}
-    ...    AND
-    ...    Setup Telemetry Configuration    ${ENABLE_TELEMETRY_TO_PROMETHUS}    ${PULL_SECRET_METRICS}
+    [Setup]    Setup Telemetry Configuration    ${ENABLE_TELEMETRY_TO_PROMETHUS}    ${PULL_SECRET_METRICS}
 
     Should Find Metrics In Journal Log Success    Metrics sent successfully
 
@@ -103,10 +97,7 @@ MicroShift Reports Metrics To Prometheus Server
         Check Prometheus Query    ${PROMETHEUS_HOST}    ${PROMETHEUS_PORT}    ${metric}    add_hostname_filter=${False}
     END
 
-    [Teardown]    Run Keywords
-    ...    Remove Telemetry Configuration
-    ...    AND
-    ...    Stop Prometheus Server    ${PROMETHEUS_PORT}
+    [Teardown]    Remove Telemetry Configuration
 
 
 *** Keywords ***
@@ -130,7 +121,7 @@ Check Required Telemetry Variables
     Should Not Be Empty    ${PROMETHEUS_HOST}    PROMETHEUS_HOST variable is required
     ${string_value}=    Convert To String    ${PROMETHEUS_PORT}
     Should Not Be Empty    ${string_value}    PROMETHEUS_PORT variable is required
-    Should Not Be Empty    ${PROXY_HOST}    PROXY_HOST variable is required
+    Should Not Be Empty    ${PROXY_PORT}    PROXY_PORT variable is required
     ${string_value}=    Convert To String    ${PROXY_PORT}
     Should Not Be Empty    ${string_value}    PROXY_PORT variable is required