From 8d50250460336cf75769d4b7772fd0cadfa8e8de Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Fri, 2 Jan 2026 12:57:00 +0200 Subject: [PATCH 1/3] Add delay in TLS tests before restarting MicroShift --- test/suites/standard1/tls-configuration.robot | 1 + 1 file changed, 1 insertion(+) diff --git a/test/suites/standard1/tls-configuration.robot b/test/suites/standard1/tls-configuration.robot index 9c72a121c8..a3ad4076ec 100644 --- a/test/suites/standard1/tls-configuration.robot +++ b/test/suites/standard1/tls-configuration.robot @@ -134,6 +134,7 @@ Setup Invalid TLS Configuration [Arguments] ${config} Drop In MicroShift Config ${config} 10-tls Save Journal Cursor + Sleep 10s # To avoid systemctl start error: Start request repeated too quickly ${stdout} ${stderr} ${rc}= Execute Command ... systemctl restart microshift.service ... sudo=True return_stdout=True return_stderr=True return_rc=True From 930100162249ca340f64e7441273d80501b560c4 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Fri, 2 Jan 2026 13:02:05 +0200 Subject: [PATCH 2/3] Add a delay in Restart MicroShift keyword --- test/resources/microshift-process.resource | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/resources/microshift-process.resource b/test/resources/microshift-process.resource index 4542a9a034..d9134680ff 100644 --- a/test/resources/microshift-process.resource +++ b/test/resources/microshift-process.resource @@ -78,9 +78,11 @@ Wait For MicroShift Service ... MicroShift Service Is Active Restart MicroShift - [Documentation] Restart the MicroShift service + [Documentation] Restart the MicroShift service with a delay to avoid too + ... many start requests. ${ushift_pid}= MicroShift Process ID ${ushift_etcd_pid}= MicroShift Etcd Process ID + Sleep 10s Systemctl restart microshift.service Wait Until MicroShift Process ID Changes ${ushift_pid} Wait Until MicroShift Etcd Process ID Changes ${ushift_etcd_pid} From a8792a328e60aba0579a17e5af2c65b7364c1008 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Sat, 3 Jan 2026 14:52:02 +0200 Subject: [PATCH 3/3] Use Restart MicroShift keyword instead of systemctl command --- test/suites/standard1/tls-configuration.robot | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test/suites/standard1/tls-configuration.robot b/test/suites/standard1/tls-configuration.robot index a3ad4076ec..1c110d6005 100644 --- a/test/suites/standard1/tls-configuration.robot +++ b/test/suites/standard1/tls-configuration.robot @@ -134,11 +134,7 @@ Setup Invalid TLS Configuration [Arguments] ${config} Drop In MicroShift Config ${config} 10-tls Save Journal Cursor - Sleep 10s # To avoid systemctl start error: Start request repeated too quickly - ${stdout} ${stderr} ${rc}= Execute Command - ... systemctl restart microshift.service - ... sudo=True return_stdout=True return_stderr=True return_rc=True - Should Be Equal As Numbers 1 ${rc} + Run Keyword And Expect Error 0 != 1 Restart MicroShift Remove TLS Drop In Config [Documentation] Remove the previously created drop-in config for storage @@ -147,11 +143,7 @@ Remove TLS Drop In Config Restore Valid TLS Configuration [Documentation] Restore the TLS configuration Remove TLS Drop In Config - Sleep 10s # To avoid systemctl start error: Start request repeated too quickly - ${stdout} ${stderr} ${rc}= Execute Command - ... systemctl restart microshift.service - ... sudo=True return_stdout=True return_stderr=True return_rc=True - Should Be Equal As Numbers 0 ${rc} + Restart MicroShift Openssl Connect Command [Documentation] Run Openssl Connect Command in the remote server