Revert "test no prometheus"

This reverts commit ee3dd58.
uyuni-project · Nov 20, 2024 · 0194bae · 0194bae
1 parent ee3dd58
commit 0194bae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/testsuite/podman_runner/13_run_salt_sle_minion.sh b/testsuite/podman_runner/13_run_salt_sle_minion.sh
@@ -7,9 +7,9 @@ echo opensuseminionproductuuid > /tmp/opensuse_product_uuid
 sudo -i podman run --privileged --rm -d --network network -v /tmp/opensuse_product_uuid:/sys/class/dmi/id/product_uuid -v /tmp/testing:/tmp -v ${src_dir}/testsuite/podman_runner/salt-minion-entry-point.sh:/salt-minion-entry-point.sh --volume /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro -p 9091:9090 --name sle_minion -h sle_minion ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-opensuse-minion:$UYUNI_VERSION bash -c "/salt-minion-entry-point.sh server 1-SUSE-KEY-x86_64"
 sudo -i podman exec sle_minion bash -c "ssh-keygen -A && /usr/sbin/sshd -e"
 sudo -i podman exec sle_minion bash -c "if [ ! -d /root/.ssh ];then mkdir /root/.ssh/;chmod 700 /root/.ssh;fi;cp /tmp/authorized_keys /root/.ssh/"
-# sudo -i podman exec -d sle_minion prometheus
-# sudo -i podman exec -d sle_minion node_exporter
-# sudo -i podman exec -d sle_minion prometheus-apache_exporter
-# sudo -i podman exec -d -e DATA_SOURCE_NAME="postgresql://user:passwd@localhost:5432/database?sslmode=disable" sle_minion prometheus-postgres_exporter
-# sudo -i podman exec -d sle_minion bash -c "exporter_exporter -config.file /etc/exporter_exporter.yaml -config.dirs /etc/exporter_exporter.d"
+sudo -i podman exec -d sle_minion prometheus
+sudo -i podman exec -d sle_minion node_exporter
+sudo -i podman exec -d sle_minion prometheus-apache_exporter
+sudo -i podman exec -d -e DATA_SOURCE_NAME="postgresql://user:passwd@localhost:5432/database?sslmode=disable" sle_minion prometheus-postgres_exporter
+sudo -i podman exec -d sle_minion bash -c "exporter_exporter -config.file /etc/exporter_exporter.yaml -config.dirs /etc/exporter_exporter.d"
 
diff --git a/testsuite/podman_runner/14_run_salt_rhlike_minion.sh b/testsuite/podman_runner/14_run_salt_rhlike_minion.sh
@@ -10,6 +10,6 @@ sudo -i podman run --privileged --rm -d --network network -p 9092:9090 -v /tmp/r
 sudo -i podman exec rhlike_minion bash -c "ssh-keygen -A && /usr/sbin/sshd -e"
 sudo -i podman exec rhlike_minion bash -c "if [ ! -d /root/.ssh ];then mkdir /root/.ssh/;chmod 700 /root/.ssh;fi;cp /tmp/authorized_keys /root/.ssh/"
 # sudo -i podman exec -d rhlike_minion prometheus
-# sudo -i podman exec -d rhlike_minion node_exporter
-# sudo -i podman exec -d rhlike_minion prometheus-apache_exporter
-# sudo -i podman exec -d -e DATA_SOURCE_NAME="postgresql://user:passwd@localhost:5432/database?sslmode=disable" rhlike_minion prometheus-postgres_exporter
+sudo -i podman exec -d rhlike_minion node_exporter
+sudo -i podman exec -d rhlike_minion prometheus-apache_exporter
+sudo -i podman exec -d -e DATA_SOURCE_NAME="postgresql://user:passwd@localhost:5432/database?sslmode=disable" rhlike_minion prometheus-postgres_exporter
diff --git a/testsuite/podman_runner/15_run_salt_deblike_minion.sh b/testsuite/podman_runner/15_run_salt_deblike_minion.sh
@@ -7,7 +7,7 @@ echo ubuntuminionproductuuid > /tmp/ubuntu_product_uuid
 sudo -i podman run --privileged --rm -d --network network -p 9093:9090 -v /tmp/ubuntu_product_uuid:/sys/class/dmi/id/product_uuid -v /tmp/testing:/tmp -v ${src_dir}/testsuite/podman_runner/salt-minion-entry-point.sh:/salt-minion-entry-point.sh --name deblike_minion -h deblike_minion ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-ubuntu-minion:$UYUNI_VERSION bash -c "/salt-minion-entry-point.sh server 1-DEBLIKE-KEY"
 sudo -i podman exec deblike_minion bash -c "ssh-keygen -A && /usr/sbin/sshd -e"
 sudo -i podman exec deblike_minion bash -c "if [ ! -d /root/.ssh ];then mkdir /root/.ssh/;chmod 700 /root/.ssh;fi;cp /tmp/authorized_keys /root/.ssh/"
-# sudo -i podman exec -d deblike_minion prometheus-node-exporter
-# sudo -i podman exec -d deblike_minion prometheus-apache-exporter
-# sudo -i podman exec -d -e DATA_SOURCE_NAME="postgresql://user:passwd@localhost:5432/database?sslmode=disable" deblike_minion prometheus-postgres-exporter
-# sudo -i podman exec -d deblike_minion bash -c "prometheus-exporter-exporter -config.file /etc/exporter_exporter.yaml -config.dirs /etc/exporter_exporter.d"
+sudo -i podman exec -d deblike_minion prometheus-node-exporter
+sudo -i podman exec -d deblike_minion prometheus-apache-exporter
+sudo -i podman exec -d -e DATA_SOURCE_NAME="postgresql://user:passwd@localhost:5432/database?sslmode=disable" deblike_minion prometheus-postgres-exporter
+sudo -i podman exec -d deblike_minion bash -c "prometheus-exporter-exporter -config.file /etc/exporter_exporter.yaml -config.dirs /etc/exporter_exporter.d"