From 89812a614fa5dbe399ab2165b73000dba19d4e18 Mon Sep 17 00:00:00 2001
From: Martin Medek <mmedek@redhat.com>
Date: Tue, 7 Jun 2022 14:24:42 +0200
Subject: [PATCH] DBZ-5165 moved the incremental build into testsuite script,
 fixed connect image version in deployment

---
 jenkins-jobs/docker/debezium-testing-system/Dockerfile       | 4 ----
 jenkins-jobs/docker/debezium-testing-system/deployment.yml   | 4 ++--
 .../docker/debezium-testing-system/testsuite-deployment.sh   | 5 +++++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jenkins-jobs/docker/debezium-testing-system/Dockerfile b/jenkins-jobs/docker/debezium-testing-system/Dockerfile
index b101bda0a..0e5f4f3d8 100644
--- a/jenkins-jobs/docker/debezium-testing-system/Dockerfile
+++ b/jenkins-jobs/docker/debezium-testing-system/Dockerfile
@@ -23,10 +23,6 @@ RUN source $sdkman_init && mvn clean install -DskipTests -DskipITs -f /testsuite
 
 # always rerun steps below, execute incremental build
 ARG CACHEBUST=1
-RUN git -C /testsuite/debezium stash
-RUN git -C /testsuite/debezium reset --hard origin/$branch # TODO why doesn't it work without it
-RUN git -C /testsuite/debezium pull $repository $branch
-RUN source $sdkman_init && mvn clean install -DskipTests -DskipITs -f /testsuite/debezium/pom.xml
 
 COPY testsuite-deployment.sh /testsuite/testsuite-deployment.sh
 RUN chmod a+x /testsuite/testsuite-deployment.sh
diff --git a/jenkins-jobs/docker/debezium-testing-system/deployment.yml b/jenkins-jobs/docker/debezium-testing-system/deployment.yml
index 9c8d846e5..a0ac11b8f 100644
--- a/jenkins-jobs/docker/debezium-testing-system/deployment.yml
+++ b/jenkins-jobs/docker/debezium-testing-system/deployment.yml
@@ -40,11 +40,11 @@ spec:
             - name: PRODUCT_BUILD
               value: "false"
             - name: DBZ_CONNECT_IMAGE 
-              value: "quay.io/debezium/testing-openshift-connect:kafka-3.1.0-1.9.0-SNAPSHOT"
+                value: "quay.io/rh_integration/test-strimzi-kafka:strz-latest-kafka-3.1.0-apc-2.2.3.Final-dbz-2.0.0-SNAPSHOT"
             - name: GROUPS
               value: "mysql & !avro & !docker"
             - name: DELETE_PROJECTS
-              value: "true"
+              value: "false"
   triggers:
     - type: "ConfigChange" 
   paused: false 
diff --git a/jenkins-jobs/docker/debezium-testing-system/testsuite-deployment.sh b/jenkins-jobs/docker/debezium-testing-system/testsuite-deployment.sh
index f473df0bc..676e34f74 100644
--- a/jenkins-jobs/docker/debezium-testing-system/testsuite-deployment.sh
+++ b/jenkins-jobs/docker/debezium-testing-system/testsuite-deployment.sh
@@ -12,6 +12,11 @@ if [ ! -f "${SECRET_PATH}" ]; then
     exit 1
 fi
 
+#TODO incremental build here
+git -C /testsuite/debezium stash
+git -C /testsuite/debezium pull origin DBZ-5165
+mvn clean install -DskipTests -DskipITs -f /testsuite/debezium/pom.xml
+
 #prepare ocp, run tests
 ${OCP_PROJECTS} --project "${OCP_PROJECT_DEBEZIUM}" --create