Update integration test profiles activation logic

SoftInstigate · Jul 16, 2024 · ef3f91b · ef3f91b
1 parent d8796b7
commit ef3f91b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    if: "!contains(github.event.head_commit.message, 'skip ci')"
+    if: '!contains(github.event.head_commit.message, "skip ci")'
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -47,7 +47,7 @@ jobs:
       - name: Build and Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-        run: mvn -B clean install -Pshade,mongodb,start-server -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"
+        run: mvn -B clean install -Pshade -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"
 
       - name: Set up QEMU
         if: ${{ matrix.deploy }}

diff --git a/.github/workflows/pullrequests.yml b/.github/workflows/pullrequests.yml
@@ -10,7 +10,6 @@ on:
 
 jobs:
   build:
-    if: "!contains(github.event.head_commit.message, 'skip ci')"
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -38,4 +37,4 @@ jobs:
       - name: Build and Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-        run: MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED" mvn -B verify -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"
+        run: MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED" mvn -B clean verify -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"
diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    if: "!contains(github.event.head_commit.message, 'skip ci')"
+    if: '!contains(github.event.head_commit.message, "skip ci")'
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -45,7 +45,7 @@ jobs:
       - name: Build and Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-        run: mvn -B clean install -Pshade,mongodb,start-server -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"
+        run: mvn -B clean install -Pshade -Dmongodb.version="${{ matrix.mongodb-version }}" -Dkarate.options="${{ matrix.karate-options }}"
 
       - name: Set up QEMU
         if: ${{ matrix.deploy }}

diff --git a/core/pom.xml b/core/pom.xml
@@ -470,7 +470,9 @@
     <profile>
       <id>mongodb</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>!skipTests</name>
+        </property>
       </activation>
       <build>
         <plugins>
@@ -537,7 +539,9 @@
     <profile>
       <id>start-server</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>!skipTests</name>
+        </property>
       </activation>
       <build>
         <plugins>