From 8fb515f62ba965869648cdf4f093cbe69a693560 Mon Sep 17 00:00:00 2001 From: Ivan Bella <347158+ivakegg@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:48:50 +0000 Subject: [PATCH] Updated compose tests to include the subrepos --- .github/workflows/tests.yml | 14 +++++++------- microservices/services/accumulo/pom.xml | 2 +- microservices/services/audit/pom.xml | 2 +- microservices/services/authorization/pom.xml | 2 +- microservices/services/dictionary/pom.xml | 2 +- microservices/services/file-provider/pom.xml | 4 ++-- microservices/services/hazelcast/pom.xml | 2 +- microservices/services/mapreduce-query/pom.xml | 2 +- microservices/services/modification/pom.xml | 2 +- microservices/services/query-executor/pom.xml | 2 +- microservices/services/query-metric/pom.xml | 2 +- microservices/services/query/pom.xml | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 05e71aa874..37ba7e6716 100644 --- 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 index 11c4f20386..56254ad67e 100644 --- a/microservices/services/accumulo/pom.xml +++ b/microservices/services/accumulo/pom.xml @@ -37,7 +37,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/audit/pom.xml b/microservices/services/audit/pom.xml index f21b2ba8a3..17dfe3e667 100644 --- a/microservices/services/audit/pom.xml +++ b/microservices/services/audit/pom.xml @@ -37,7 +37,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/authorization/pom.xml b/microservices/services/authorization/pom.xml index 60df2ddfa7..31bffb2aa9 100644 --- a/microservices/services/authorization/pom.xml +++ b/microservices/services/authorization/pom.xml @@ -37,7 +37,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/dictionary/pom.xml b/microservices/services/dictionary/pom.xml index d58b8ef32a..a9a7e0b987 100644 --- a/microservices/services/dictionary/pom.xml +++ b/microservices/services/dictionary/pom.xml @@ -37,7 +37,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/file-provider/pom.xml b/microservices/services/file-provider/pom.xml index cfbd15858d..651ee05022 100644 --- a/microservices/services/file-provider/pom.xml +++ b/microservices/services/file-provider/pom.xml @@ -37,7 +37,7 @@ services - !skipServices + !onlyServiceApis @@ -45,4 +45,4 @@ - \ No newline at end of file + diff --git a/microservices/services/hazelcast/pom.xml b/microservices/services/hazelcast/pom.xml index 0345b832c6..a8de82f892 100644 --- a/microservices/services/hazelcast/pom.xml +++ b/microservices/services/hazelcast/pom.xml @@ -38,7 +38,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/mapreduce-query/pom.xml b/microservices/services/mapreduce-query/pom.xml index cbf266701d..cf70edf8ed 100644 --- a/microservices/services/mapreduce-query/pom.xml +++ b/microservices/services/mapreduce-query/pom.xml @@ -36,7 +36,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/modification/pom.xml b/microservices/services/modification/pom.xml index 57b79217c3..932e2c025d 100644 --- a/microservices/services/modification/pom.xml +++ b/microservices/services/modification/pom.xml @@ -37,7 +37,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/query-executor/pom.xml b/microservices/services/query-executor/pom.xml index c44f5f3ef4..54513a0065 100644 --- a/microservices/services/query-executor/pom.xml +++ b/microservices/services/query-executor/pom.xml @@ -36,7 +36,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/query-metric/pom.xml b/microservices/services/query-metric/pom.xml index e51cb2214d..e97b4ae834 100644 --- a/microservices/services/query-metric/pom.xml +++ b/microservices/services/query-metric/pom.xml @@ -37,7 +37,7 @@ services - !skipServices + !onlyServiceApis diff --git a/microservices/services/query/pom.xml b/microservices/services/query/pom.xml index 2f8b3f005b..9f5a086942 100644 --- a/microservices/services/query/pom.xml +++ b/microservices/services/query/pom.xml @@ -36,7 +36,7 @@ services - !skipServices + !onlyServiceApis