From 99a9ac70a03c410e75de2c88e0c580369b8cddbf Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:36:52 -0800
Subject: [PATCH 1/4] Update sink-connector-kafka-tests.yml

---
 .github/workflows/sink-connector-kafka-tests.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sink-connector-kafka-tests.yml b/.github/workflows/sink-connector-kafka-tests.yml
index 54559862e..7f99303b2 100644
--- 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

From 1804a274fbefd034ada9570baf9ec8f1fc339a49 Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:38:28 -0800
Subject: [PATCH 2/4] Update sink-connector-lightweight-tests.yml

---
 .../sink-connector-lightweight-tests.yml         | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sink-connector-lightweight-tests.yml b/.github/workflows/sink-connector-lightweight-tests.yml
index 0e4e1838f..4237464ff 100644
--- 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
\ No newline at end of file
+        run: mvn test

From 20e8160b04fe4c11a3d0fb77fd9523a413a80ec6 Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:39:27 -0800
Subject: [PATCH 3/4] Update pull-request.yml

---
 .github/workflows/pull-request.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 02b3e09b2..bb4692156 100644
--- 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

From a39db8df9ee8dc1fe1f7e20cd5cac1cc853f624d Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:40:04 -0800
Subject: [PATCH 4/4] Update release.yml

---
 .github/workflows/release.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ae5755920..98331b8c4 100644
--- 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 }}
\ No newline at end of file
+      draft: ${{ inputs.draft }}