opensource/graylog2-server
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog2-server.git synced 2026-03-13 09:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

DataNode: Use the correct architecture for the distribution jar in tests (#16372)

Browse Source 
* fix to use the correct architecture for the distribution jar

* added check for archive

* added missing import
This commit is contained in:
Jan Heise
2023-09-06 07:36:46 +02:00
committed by GitHub
parent d39ad673f4
commit fb5f07e51c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data-node/src/test/java/org/graylog/datanode/testinfra/DatanodeContainerizedBackend.java
View File

@@ -16,6 +16,7 @@
*/
package org.graylog.datanode.testinfra;
import org.graylog.datanode.OpensearchDistribution;
import org.graylog.testing.completebackend.DefaultMavenProjectDirProvider;
import org.graylog.testing.completebackend.DefaultPluginJarsProvider;
import org.graylog.testing.graylognode.MavenPackager;
@@ -26,6 +27,7 @@ import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.images.builder.ImageFromDockerfile;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.Collections;
@@ -113,7 +115,13 @@ public class DatanodeContainerizedBackend {
}
private static ImageFromDockerfile createDockerImageFile(String opensearchVersion) {
final String opensearchTarArchive = "opensearch-" + opensearchVersion + "-linux-x64.tar.gz";
final String opensearchTarArchive = "opensearch-" + opensearchVersion + "-linux-" + OpensearchDistribution.archCode(System.getProperty("os.arch")) + ".tar.gz";
final Path downloadedOpensearch = Path.of("target", "downloads", opensearchTarArchive);
if(!Files.exists(downloadedOpensearch)) {
throw new RuntimeException("Failed to link opensearch distribution to the datanode docker image, path" + downloadedOpensearch.toAbsolutePath() + " doesn't exist!");
}
return new ImageFromDockerfile("local/graylog-datanode:latest", false)
// the following command makes the opensearch tar.gz archive accessible in the docker build context, so it can
// be later used by the ADD command