Merge pull request #8413 from rystsov/issue-7979

Introduces new compacted verifier unaffected by the "ssh" errors

tests/docker/Dockerfile

@@ -31,12 +31,13 @@ RUN git -C /opt clone https://github.com/redpanda-data/kafka-streams-examples.gi
     cd /opt/kafka-streams-examples && git reset --hard 913d08c8351c74ee454b79f8e0c1f48ca9b562a5 && \
     mvn -DskipTests=true clean package
 
-# Install our in-tree Java test clientst
-RUN mkdir -p /opt/redpanda-tests
-COPY --chown=0:0 tests/java /opt/redpanda-tests/java
-RUN mvn clean package --batch-mode --file /opt/redpanda-tests/java/kafka-verifier --define buildDir=/opt/kafka-verifier/
-RUN mvn clean package --batch-mode --file /opt/redpanda-tests/java/compacted-log-verifier --define buildDir=/opt/compacted-log-verifier
-RUN mvn clean package --batch-mode --file /opt/redpanda-tests/java/tx-verifier --define buildDir=/opt/tx-verifier
+# Install the OMB tool
+RUN /opt/ducktape-deps.sh install_omb
+
+
+# Install Kafka Java test clients / workloads
+RUN mkdir -p /opt/redpanda-tests/java
+COPY --chown=0:0 tests/java/e2e-verifiers /opt/redpanda-tests/java/e2e-verifiers
 RUN mvn clean package --batch-mode --file /opt/redpanda-tests/java/e2e-verifiers --define buildDir=/opt/e2e-verifiers
 
 # - install distro-packaged depedencies
@@ -49,10 +50,6 @@ RUN /opt/ducktape-deps.sh install_system_deps && \
     echo 'root soft nofile 65535' >> /etc/security/limits.conf && \
     echo 'root hard nofile 65535' >> /etc/security/limits.conf
 
-
-# Install the OMB tool
-RUN /opt/ducktape-deps.sh install_omb
-
 # install kafka binary dependencies, librdkafka dev, kcat and kaf tools
 ENV KAFKA_MIRROR="https://s3-us-west-2.amazonaws.com/kafka-packages"
 RUN /opt/ducktape-deps.sh install_kafka_tools && \
@@ -121,4 +118,12 @@ RUN mkdir -p /opt/scripts/consumer_offsets_recovery
 COPY --chown=0:0 tools/consumer_offsets_recovery /opt/scripts/consumer_offsets_recovery
 RUN python3 -m pip install --force --no-cache-dir -r  /opt/scripts/consumer_offsets_recovery/requirements.txt
 
+# Install our in-tree Java test clients / workloads
+COPY --chown=0:0 tests/java/verifiers /opt/redpanda-tests/java/verifiers
+RUN mvn clean package --batch-mode --file /opt/redpanda-tests/java/verifiers --define buildDir=/opt/verifiers
+
+# Install remote_scripts
+RUN mkdir -p /opt/remote
+COPY --chown=0:0 tests/rptest/remote_scripts /opt/remote
+
 CMD service ssh start && tail -f /dev/null

tests/docker/Dockerfile.dockerignore

@@ -7,3 +7,4 @@
 !tools/offline_log_viewer
 !tools/consumer_offsets_recovery
 !tests/docker/ducktape-deps.sh
+!tests/rptest/remote_scripts