move integration tests to regular build

locationtech · Sep 17, 2024 · d741e27 · d741e27
1 parent 073a768
commit d741e27
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 65 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -46,109 +46,114 @@ jobs:
         run: rm -rf ~/.m2/repository/org/locationtech/geomesa
   accumulo-ds-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -pl :geomesa-accumulo-datastore_${{ inputs.scala-version }}
       scala-version: ${{ inputs.scala-version }}
   accumulo-other-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-accumulo -pl -:geomesa-accumulo-datastore_${{ inputs.scala-version }}
       scala-version: ${{ inputs.scala-version }}
   arrow-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-arrow
       scala-version: ${{ inputs.scala-version }}
   cassandra-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-cassandra
       scala-version: ${{ inputs.scala-version }}
   convert-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-convert
       scala-version: ${{ inputs.scala-version }}
   cqengine-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-cqengine-parent
       scala-version: ${{ inputs.scala-version }}
   features-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-features
       scala-version: ${{ inputs.scala-version }}
   fs-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-fs
       scala-version: ${{ inputs.scala-version }}
   gt-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-gt
       scala-version: ${{ inputs.scala-version }}
   hbase-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-hbase
       scala-version: ${{ inputs.scala-version }}
   kafka-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-kafka
       scala-version: ${{ inputs.scala-version }}
   lambda-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-lambda
       scala-version: ${{ inputs.scala-version }}
   metrics-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-metrics
       scala-version: ${{ inputs.scala-version }}
   process-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-process
       scala-version: ${{ inputs.scala-version }}
   redis-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-redis
       scala-version: ${{ inputs.scala-version }}
   spark-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-spark
       scala-version: ${{ inputs.scala-version }}
   utils-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -f geomesa-utils-parent
       scala-version: ${{ inputs.scala-version }}
   other-tests:
     needs: build-scala
-    uses: ./.github/workflows/module-unit-tests.yml
+    uses: ./.github/workflows/unit-tests.yml
     with:
       module-selector: -pl geomesa-filter,geomesa-index-api,geomesa-jobs,geomesa-security,geomesa-tools,geomesa-z3
       scala-version: ${{ inputs.scala-version }}
+  integration-tests:
+    needs: build-scala
+    uses: ./.github/workflows/integration-tests.yml
+    with:
+      scala-version: ${{ inputs.scala-version }}
diff --git a/.github/workflows/integration-tests-2.12.yml b/.github/workflows/integration-tests-2.12.yml
diff --git a/.github/workflows/integration-tests-2.13.yml → .github/workflows/integration-tests.yml b/.github/workflows/integration-tests-2.13.yml → .github/workflows/integration-tests.yml
@@ -1,22 +1,19 @@
-name: integration-tests-2.13
+name: integration-tests
 
 on:
-  push:
-  pull_request:
+  workflow_call:
+    inputs:
+      scala-version:
+        required: false
+        type: string
+        default: "2.12"
 
 permissions:  # added using https://github.com/step-security/secure-repo
   contents: read
 
-env:
-  MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dlicense.skip=true --batch-mode
-  MAVEN_TEST_OPTS: -Dtest.fork.count=1
-
 jobs:
-  build-scala:
+  integration-tests:
     runs-on: ubuntu-latest
-    # avoid duplicate jobs on PRs from the main repo
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
@@ -25,9 +22,18 @@ jobs:
           java-version: '11'
           cache: 'maven'
       - name: Set Scala version
-        run: ./build/scripts/change-scala-version.sh 2.13
-      - name: Build with Maven
-        run: ./build/mvn clean install $MAVEN_CLI_OPTS -DskipTests -T4
+        run: |
+          echo ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
+          ./build/scripts/change-scala-version.sh ${{ inputs.scala-version }}
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: classes-and-jars
+      - name: Install artifacts
+        run: |
+          tar -xf classes.tgz
+          mkdir -p ~/.m2/repository/org/locationtech/geomesa
+          mv m2-geomesa/* ~/.m2/repository/org/locationtech/geomesa/
       - name: Integration Tests
         run: mvn failsafe:integration-test failsafe:verify $MAVEN_CLI_OPTS $MAVEN_TEST_OPTS
       - name: Remove geomesa artifacts

diff --git a/.github/workflows/module-unit-tests.yml → .github/workflows/unit-tests.yml b/.github/workflows/module-unit-tests.yml → .github/workflows/unit-tests.yml