From 0419d1a7022733976015c0cc9b0676ff1e3200ad Mon Sep 17 00:00:00 2001 From: Jakub Jedlicka Date: Wed, 18 Sep 2024 18:26:55 +0200 Subject: [PATCH 1/2] Remove `tls-registry` extension from default aplication request for TLS command --- .../java/io/quarkus/test/bootstrap/tls/QuarkusTlsCommand.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/tls/QuarkusTlsCommand.java b/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/tls/QuarkusTlsCommand.java index 86e61b31f..e0d05406e 100644 --- a/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/tls/QuarkusTlsCommand.java +++ b/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/tls/QuarkusTlsCommand.java @@ -39,8 +39,7 @@ QuarkusCliCommandResult runTlsCommand(List subCmdArgs) { private static QuarkusCliClient.CreateApplicationRequest getCreateAppReq() { return QuarkusCliClient.CreateApplicationRequest.defaults() - // TODO: we can drop 'tls-registry' when https://github.com/quarkusio/quarkus/issues/42751 is fixed - .withExtensions("tls-registry", "quarkus-rest"); + .withExtensions("quarkus-rest"); } private static File createTempDir() { From 626955a767ee705ad066b273c99caf5cc2acc42b Mon Sep 17 00:00:00 2001 From: Jakub Jedlicka Date: Wed, 18 Sep 2024 19:55:15 +0200 Subject: [PATCH 2/2] Change description/TODO note of management TLS tests --- .../management/src/test/java/io/quarkus/qe/LocalTLSIT.java | 2 +- .../src/test/java/io/quarkus/qe/OpenShiftTLSIT.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/management/src/test/java/io/quarkus/qe/LocalTLSIT.java b/examples/management/src/test/java/io/quarkus/qe/LocalTLSIT.java index 10d14023a..3f2cbf9e7 100644 --- a/examples/management/src/test/java/io/quarkus/qe/LocalTLSIT.java +++ b/examples/management/src/test/java/io/quarkus/qe/LocalTLSIT.java @@ -11,7 +11,7 @@ import io.restassured.response.Response; @QuarkusScenario -// todo Merge with LocalIT when https://github.com/quarkusio/quarkus/issues/32225 is fixed +// todo Merge with LocalIT when framework support SSL/TLS on openshift https://github.com/quarkus-qe/quarkus-test-framework/issues/1052 public class LocalTLSIT { @QuarkusApplication(certificates = @Certificate(configureManagementInterface = true, configureKeystore = true, useTlsRegistry = false)) diff --git a/examples/management/src/test/java/io/quarkus/qe/OpenShiftTLSIT.java b/examples/management/src/test/java/io/quarkus/qe/OpenShiftTLSIT.java index 3c8a06cff..b037e176d 100644 --- a/examples/management/src/test/java/io/quarkus/qe/OpenShiftTLSIT.java +++ b/examples/management/src/test/java/io/quarkus/qe/OpenShiftTLSIT.java @@ -5,7 +5,7 @@ import io.quarkus.test.scenarios.OpenShiftScenario; @OpenShiftScenario -@Disabled -// todo delete when https://github.com/quarkusio/quarkus/issues/32225 is fixed +@Disabled("https://github.com/quarkus-qe/quarkus-test-framework/issues/1052") +// todo delete when framework support SSL/TLS on openshift public class OpenShiftTLSIT extends LocalTLSIT { }