Merge pull request #399 from Altinity/java-test-docker

Docker tag in Java tests
Altinity · Dec 4, 2023 · a00df9d · a00df9d
2 parents 0a8ca58 + a39db8d
commit a00df9d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 8 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -12,28 +12,32 @@ on:
 jobs:
   build-kafka-lightweight:
     uses: ./.github/workflows/docker-build.yml
+    secrets: inherit
     with:
       IMAGE_TAG: ${{ github.event.number }}-${{ github.sha }}
-    secrets: inherit
 
   testflows-kafka:
     needs: [build-kafka-lightweight]
     uses: ./.github/workflows/testflows-sink-connector-kafka.yml
+    secrets: inherit
     with:
       SINK_CONNECTOR_IMAGE: altinityinfra/clickhouse-sink-connector:${{ github.event.number }}-${{ github.sha }}-kafka
-    secrets: inherit
 
   testflows-lightweight:
     needs: [build-kafka-lightweight]
     uses: ./.github/workflows/testflows-sink-connector-lightweight.yml
+    secrets: inherit
     with:
       SINK_CONNECTOR_IMAGE: altinityinfra/clickhouse-sink-connector:${{ github.event.number }}-${{ github.sha }}-lt
-    secrets: inherit
 
   java-tests-kafka:
     needs: [build-kafka-lightweight]
     uses: ./.github/workflows/sink-connector-kafka-tests.yml
-
+    with:
+      SINK_CONNECTOR_IMAGE: altinityinfra/clickhouse-sink-connector:${{ github.event.number }}-${{ github.sha }}-kafka
+
   java-tests-lightweight:
     needs: [build-kafka-lightweight]
     uses: ./.github/workflows/sink-connector-lightweight-tests.yml
+    with:
+      SINK_CONNECTOR_IMAGE: altinityinfra/clickhouse-sink-connector:${{ github.event.number }}-${{ github.sha }}-lt
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,10 +39,14 @@ jobs:
   java-tests-kafka:
     needs: [build-kafka-lightweight]
     uses: ./.github/workflows/sink-connector-kafka-tests.yml
-
+    with:
+      SINK_CONNECTOR_IMAGE: altinityinfra/clickhouse-sink-connector:${{ github.event.number }}-${{ github.sha }}-kafka
+
   java-tests-lightweight:
     needs: [build-kafka-lightweight]
     uses: ./.github/workflows/sink-connector-lightweight-tests.yml
+    with:
+      SINK_CONNECTOR_IMAGE: altinityinfra/clickhouse-sink-connector:${{ github.event.number }}-${{ github.sha }}-lt
 
   publish:
     needs: [testflows-kafka, testflows-lightweight, java-tests-kafka, java-tests-lightweight]
@@ -51,4 +55,4 @@ jobs:
     with:
       release_tag: ${{ inputs.release_tag }}
       prerelease: ${{ inputs.prerelease }}
-      draft: ${{ inputs.draft }}
+      draft: ${{ inputs.draft }}
diff --git a/.github/workflows/sink-connector-kafka-tests.yml b/.github/workflows/sink-connector-kafka-tests.yml
@@ -1,8 +1,22 @@
 name: Kafka - Java Tests
 
-on: 
+on:
   workflow_call:
+    inputs:
+      SINK_CONNECTOR_IMAGE:
+        description: "Kafka connector docker image"
+        required: true
+        type: string
+  workflow_dispatch:
+    inputs:
+      SINK_CONNECTOR_IMAGE:
+        description: "Kafka connector docker image"
+        required: true
+        type: string
 
+env:
+  SINK_CONNECTOR_IMAGE: ${{ inputs.SINK_CONNECTOR_IMAGE }}
+
 jobs:
   java-kafka:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/sink-connector-lightweight-tests.yml b/.github/workflows/sink-connector-lightweight-tests.yml
@@ -2,6 +2,20 @@ name: Lightweight - Java Tests
 
 on:
   workflow_call:
+    inputs:
+      SINK_CONNECTOR_IMAGE:
+        description: "Lightweight connector docker image"
+        required: true
+        type: string
+  workflow_dispatch:
+    inputs:
+      SINK_CONNECTOR_IMAGE:
+        description: "Lightweight connector docker image"
+        required: true
+        type: string
+
+env:
+  SINK_CONNECTOR_IMAGE: ${{ inputs.SINK_CONNECTOR_IMAGE }}
 
 jobs:
   java-lightweight:
@@ -21,4 +35,4 @@ jobs:
         run: mvn install -DskipTests=true
       - name: Build Replicator with Maven
         working-directory: sink-connector-lightweight
-        run: mvn test
+        run: mvn test