Updated compose tests to include the subrepos

NationalSecurityAgency · Nov 27, 2024 · 8fb515f · 8fb515f
1 parent ab18e63
commit 8fb515f
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -110,14 +110,14 @@ jobs:
   #         USER_NAME: ${{ secrets.USER_NAME }}
   #         ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
   #       run: |
-  #         BUILD="mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e -Pdev,examples,assemble,spotbugs -Dmaven.build.cache.enabled=false -DskipServices -Ddeploy -Ddist -T1C -pl "-:config-service" clean install -DskipTests"
+  #         BUILD="mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e -Dstarters -Dservices -Dutils -Pdev,examples,assemble,spotbugs -Dmaven.build.cache.enabled=false -DonlyServiceApis -Ddeploy -Ddist -T1C -pl "-:config-service" clean install -DskipTests"
   #         $BUILD
   #     - name: Run Microservice Unit Tests
   #       env:
   #         USER_NAME: ${{ secrets.USER_NAME }}
   #         ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
   #       run: |
-  #         RUN_TESTS="mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e -Dmaven.build.cache.enabled=false verify"
+  #         RUN_TESTS="mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -V -B -e -Dstarters -Dservices -Dutils -Dmaven.build.cache.enabled=false verify"
   #         cd microservices
   #         $RUN_TESTS \
   #           || { echo "***** TESTS FAILED. Attempting retry."; $RUN_TESTS; } \
@@ -183,13 +183,13 @@ jobs:
           ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: |
           # update datawave dependencies to use the latest snapshots
-          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e versions:update-properties versions:update-parent -DallowSnapshots=true -Dincludes=gov.nsa.*
+          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Dstarters -Dservices -Dutils versions:update-properties versions:update-parent -DallowSnapshots=true -Dincludes=gov.nsa.*
           
-          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Pcompose -Dmicroservice-docker -Dquickstart-docker -Ddeploy -Dtar -DskipTests clean install
+          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Dstarters -Dservices -Dutils -Pcompose -Dmicroservice-docker -Dquickstart-docker -Ddeploy -Dtar -DskipTests clean install
           
           # free up some space so that we don't run out
           docker system prune -f
-          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Pcompose -Dmicroservice-docker -Dquickstart-docker -Ddeploy -Dtar -DskipTests clean
+          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Dstarters -Dservices -Dutils -Pcompose -Dmicroservice-docker -Dquickstart-docker -Ddeploy -Dtar -DskipTests clean
           
           cd docker
           ./bootstrap.sh
@@ -264,10 +264,10 @@ jobs:
                      -Durl.hadoop=https://bogus.apache.org/hadoop/common/hadoop-3.3.6/hadoop-3.3.6.tar.gz \
                      -Durl.maven=https://bogus.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz"
           
-          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Pcompose -Dmicroservice-docker -Dquickstart-docker -Dquickstart-maven ${DIST_URLS} -Ddeploy -Dtar -DskipTests -Dmaven.build.cache.enabled=false clean install
+          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Dstarters -Dservices -Dutils -Pcompose -Dmicroservice-docker -Dquickstart-docker -Dquickstart-maven ${DIST_URLS} -Ddeploy -Dtar -DskipTests -Dmaven.build.cache.enabled=false clean install
           # free up some space so that we don't run out
           docker system prune -f
-          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Pcompose -Dmicroservice-docker -Dquickstart-docker -Dquickstart-maven ${DIST_URLS} -Ddeploy -Dtar -DskipTests -Dmaven.build.cache.enabled=false clean
+          mvn -s $GITHUB_WORKSPACE/.github/workflows/settings.xml -B -V -e -Dstarters -Dservices -Dutils -Pcompose -Dmicroservice-docker -Dquickstart-docker -Dquickstart-maven ${DIST_URLS} -Ddeploy -Dtar -DskipTests -Dmaven.build.cache.enabled=false clean
           cd docker
           ./bootstrap.sh
           attempt=0

diff --git a/microservices/services/accumulo/pom.xml b/microservices/services/accumulo/pom.xml
@@ -37,7 +37,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/audit/pom.xml b/microservices/services/audit/pom.xml
@@ -37,7 +37,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/authorization/pom.xml b/microservices/services/authorization/pom.xml
@@ -37,7 +37,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/dictionary/pom.xml b/microservices/services/dictionary/pom.xml
@@ -37,7 +37,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/file-provider/pom.xml b/microservices/services/file-provider/pom.xml
@@ -37,12 +37,12 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>
                 <module>service</module>
             </modules>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/microservices/services/hazelcast/pom.xml b/microservices/services/hazelcast/pom.xml
@@ -38,7 +38,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/mapreduce-query/pom.xml b/microservices/services/mapreduce-query/pom.xml
@@ -36,7 +36,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/modification/pom.xml b/microservices/services/modification/pom.xml
@@ -37,7 +37,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/query-executor/pom.xml b/microservices/services/query-executor/pom.xml
@@ -36,7 +36,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/query-metric/pom.xml b/microservices/services/query-metric/pom.xml
@@ -37,7 +37,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>

diff --git a/microservices/services/query/pom.xml b/microservices/services/query/pom.xml
@@ -36,7 +36,7 @@
             <id>services</id>
             <activation>
                 <property>
-                    <name>!skipServices</name>
+                    <name>!onlyServiceApis</name>
                 </property>
             </activation>
             <modules>