Fix kroxylicious#753: quick profile should exclude the building integ…

…ration and system tests too (kroxylicious#754) why: developer productivity also: repositioned 'enforce-systemtest-isolation' within the qa profile so that it is skipped too Signed-off-by: kwall <[email protected]>
franvila · Nov 28, 2023 · 07349dc · 07349dc
1 parent 2e1bef0
commit 07349dc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 27 deletions.
diff --git 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
@@ -342,10 +342,8 @@
         <module>kroxylicious-integration-test-support</module>
         <module>kroxylicious-filter-test-support</module>
         <module>kroxylicious-runtime</module>
-        <module>kroxylicious-integration-tests</module>
         <module>kroxylicious-filters</module>
         <module>kroxylicious-sample</module>
-        <module>kroxylicious-systemtests</module>
     </modules>
 
 
@@ -670,27 +668,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce-systemtest-isolation</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <bannedDependencies>
-                                    <excludes>
-                                        <exclude>io.kroxylicious:kroxylicious-systemtests</exclude>
-                                    </excludes>
-                                </bannedDependencies>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -823,6 +800,21 @@
                                     </rules>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>enforce-systemtest-isolation</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <bannedDependencies>
+                                            <excludes>
+                                                <exclude>io.kroxylicious:kroxylicious-systemtests</exclude>
+                                            </excludes>
+                                        </bannedDependencies>
+                                    </rules>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
                 </plugins>
@@ -912,13 +904,15 @@
             </build>
         </profile>
         <profile>
-            <id>performance</id>
+            <id>test-suites</id>
             <activation>
                 <property>
                     <name>!quick</name>
                 </property>
             </activation>
             <modules>
+                <module>kroxylicious-integration-tests</module>
+                <module>kroxylicious-systemtests</module>
                 <module>performance-tests</module>
             </modules>
         </profile>