diff --git a/Dockerfile b/Dockerfile index 846c0dcb03..2bf6d95274 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ FROM registry.access.redhat.com/ubi9/openjdk-17:1.15 AS builder USER root WORKDIR /opt/kroxylicious COPY . . -RUN ./mvnw -B clean verify -Pdist,withAdditionalFilters -Dquick -am -pl !kroxylicious-integration-tests +RUN ./mvnw -B clean verify -Pdist,withAdditionalFilters -Dquick USER 185 FROM registry.access.redhat.com/ubi9/ubi-minimal:9.2 @@ -51,6 +51,4 @@ RUN set -ex; \ chmod +x /usr/bin/tini; \ fi COPY --from=builder /opt/kroxylicious/kroxylicious-app/target/kroxylicious-app-${KROXYLICIOUS_VERSION}-bin/kroxylicious-app-${KROXYLICIOUS_VERSION}/ /opt/kroxylicious/ -COPY --from=builder /opt/kroxylicious/kroxylicious-filters/kroxylicious-multitenant/target/kroxylicious-multitenant-${KROXYLICIOUS_VERSION}.jar /opt/kroxylicious/libs/ -COPY --from=builder /opt/kroxylicious/kroxylicious-filters/kroxylicious-record-validation/target/kroxylicious-record-validation-${KROXYLICIOUS_VERSION}.jar /opt/kroxylicious/libs/ ENTRYPOINT ["/usr/bin/tini", "--", "/opt/kroxylicious/bin/kroxylicious-start.sh" ] diff --git a/pom.xml b/pom.xml index e9f63d35b1..073d424125 100644 --- a/pom.xml +++ b/pom.xml @@ -342,10 +342,8 @@ kroxylicious-integration-test-support kroxylicious-filter-test-support kroxylicious-runtime - kroxylicious-integration-tests kroxylicious-filters kroxylicious-sample - kroxylicious-systemtests @@ -670,27 +668,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-systemtest-isolation - - enforce - - - - - - io.kroxylicious:kroxylicious-systemtests - - - - - - - @@ -823,6 +800,21 @@ + + enforce-systemtest-isolation + + enforce + + + + + + io.kroxylicious:kroxylicious-systemtests + + + + + @@ -912,13 +904,15 @@ - performance + test-suites !quick + kroxylicious-integration-tests + kroxylicious-systemtests performance-tests