diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 03fc404..ee8b056 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -9,9 +9,19 @@ services: ports: [2375, 8080] steps: + build: image: maven:3.9.9-eclipse-temurin-17 - commands: mvn deploy --settings=.woodpecker/maven/settings.xml + commands: mvn deploy --settings=.woodpecker/maven/settings.xml -Dmaven.test.redirectTestOutputToFile=true -X environment: NEXUS_USERNAME: {from_secret: nexus_username} NEXUS_PASSWORD: {from_secret: nexus_password} + + debug: + image: kokuwaio/dockerd + commands: + - docker ps --all + - docker logs keylcoak + - exit 1 + when: + status: failure diff --git a/.woodpecker/verify.yaml b/.woodpecker/verify.yaml index 99b3d8c..3b16e79 100644 --- a/.woodpecker/verify.yaml +++ b/.woodpecker/verify.yaml @@ -1,17 +1,16 @@ when: - event: [manual, pull_request, push] - branch: main + event: [manual, pull_request] path: [.woodpecker/verify.yaml, pom.xml, src/**] matrix: KEYCLOAK_VERSION: - # - 22.0.5 - # - 23.0.7 - # - 24.0.5 - # - 25.0.6 - # - 26.0.8 - # - 26.1.5 - - 26.2.1 + - 22.0.5 + - 23.0.7 + - 24.0.5 + - 25.0.6 + - 26.0.8 + - 26.1.5 + - 26.2.5 services: - name: dockerd diff --git a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java index d50d7c2..df5bd0e 100644 --- a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java +++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java @@ -30,6 +30,7 @@ public class KeycloakExtension implements BeforeAllCallback, ParameterResolver { private static KeycloakClient client; private static Prometheus prometheus; + @SuppressWarnings({ "resource", "deprecation" }) @Override public void beforeAll(ExtensionContext context) throws Exception { @@ -52,11 +53,14 @@ public class KeycloakExtension implements BeforeAllCallback, ParameterResolver { // create and start container - @SuppressWarnings({ "resource", "deprecation" }) - var container = (System.getenv("CI") == null - ? new GenericContainer<>(image).withExposedPorts(8080) - : new FixedHostPortGenericContainer<>(image).withFixedExposedPort(8080, 8080)) - .withEnv("KEYCLOAK_ADMIN", "admin") + var container = new GenericContainer<>(image).withExposedPorts(8080); + if (System.getenv("CI") != null) { + // use fixed port and hostname in ci + container = new FixedHostPortGenericContainer<>(image) + .withFixedExposedPort(8080, 8080) + .withCreateContainerCmdModifier(c -> c.withName("keycloak")); + } + container.withEnv("KEYCLOAK_ADMIN", "admin") .withEnv("KEYCLOAK_ADMIN_PASSWORD", "password") .withEnv("KC_LOG_LEVEL", "io.kokuwa:trace") // otherwise port 9000 will be used, with this config we can test different keycloak versions @@ -79,6 +83,12 @@ public class KeycloakExtension implements BeforeAllCallback, ParameterResolver { // create client for keycloak container var url = "http://" + container.getHost() + ":" + container.getMappedPort(8080); + System.out.println(container.getHost()); + System.out.println(container.getHost()); + System.out.println(container.getHost()); + System.out.println(container.getExtraHosts()); + System.out.println(container.getExtraHosts()); + System.out.println(container.getExtraHosts()); var keycloak = Keycloak.getInstance(url, "master", "admin", "password", "admin-cli"); assertEquals(version, keycloak.serverInfo().getInfo().getSystemInfo().getVersion(), "version invalid"); var target = ClientBuilder.newClient().target(url);