From 4b6d6673665d1557ee95d01fa86d3b2b250ecde7 Mon Sep 17 00:00:00 2001
From: Tomas Dvorak <tomas.dvorak@graylog.com>
Date: Wed, 21 Jun 2023 10:36:22 +0200
Subject: [PATCH] Run MavenPackager before integration tests in datanode
 (#15780)

---
 data-node/pom.xml                                    | 10 +++++++++-
 .../testinfra/DatanodeContainerizedBackend.java      | 12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/data-node/pom.xml b/data-node/pom.xml
index 684ae4423c..280e8b1069 100644
--- a/data-node/pom.xml
+++ b/data-node/pom.xml
@@ -407,7 +407,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.1</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -436,6 +436,14 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.graylog2</groupId>
+            <artifactId>graylog2-server</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/data-node/src/test/java/org/graylog/datanode/testinfra/DatanodeContainerizedBackend.java b/data-node/src/test/java/org/graylog/datanode/testinfra/DatanodeContainerizedBackend.java
index 927f806465..593f3f5efa 100644
--- a/data-node/src/test/java/org/graylog/datanode/testinfra/DatanodeContainerizedBackend.java
+++ b/data-node/src/test/java/org/graylog/datanode/testinfra/DatanodeContainerizedBackend.java
@@ -16,6 +16,10 @@
  */
 package org.graylog.datanode.testinfra;
 
+import org.graylog.testing.completebackend.DefaultMavenProjectDirProvider;
+import org.graylog.testing.completebackend.DefaultPluginJarsProvider;
+import org.graylog.testing.graylognode.MavenPackager;
+import org.graylog.testing.graylognode.NodeContainerConfig;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
@@ -24,6 +28,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.time.Duration;
+import java.util.Collections;
 import java.util.Properties;
 
 public class DatanodeContainerizedBackend {
@@ -60,6 +65,9 @@ public class DatanodeContainerizedBackend {
     }
 
     private GenericContainer<?> createDatanodeContainer(String nodeName, DatanodeDockerHooks customizer, ImageFromDockerfile image, String datanodeVersion) {
+
+        MavenPackager.packageJarIfNecessary(createConfig());
+
         GenericContainer<?> container = new GenericContainer<>(image)
                 .withExposedPorts(DATANODE_REST_PORT, DATANODE_OPENSEARCH_PORT)
                 .withNetwork(network)
@@ -96,6 +104,10 @@ public class DatanodeContainerizedBackend {
         return container;
     }
 
+    private NodeContainerConfig createConfig() {
+        return new NodeContainerConfig(this.network, this.mongodbContainer.getHost(), null, null, new int[]{}, new DefaultPluginJarsProvider(),new DefaultMavenProjectDirProvider(), Collections.emptyList());
+    }
+
     private static ImageFromDockerfile createDockerImageFile(String opensearchVersion) {
         final String opensearchTarArchive = "opensearch-" + opensearchVersion + "-linux-x64.tar.gz";
         return new ImageFromDockerfile("local/graylog-datanode:latest", false)