From 70211b15c1f011f9767c9198fcbf3b5dbaa20460 Mon Sep 17 00:00:00 2001 From: Jan Was <jan.was@starburstdata.com> Date: Wed, 8 Dec 2021 11:29:26 +0100 Subject: [PATCH] Rename Product Tests reports target dir --- .github/workflows/ci.yml | 2 +- .../java/io/trino/tests/product/launcher/cli/SuiteDescribe.java | 2 +- .../main/java/io/trino/tests/product/launcher/cli/SuiteRun.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9db64c56009a..9f2b80549d64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -507,5 +507,5 @@ jobs: with: name: result pt (${{ matrix.config }}, ${{ matrix.suite }}) path: | - presto-product-tests/target/* + testing/trino-product-tests/target/* logs/* diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteDescribe.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteDescribe.java index d9d1b619a36f..06abc44071e7 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteDescribe.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteDescribe.java @@ -157,7 +157,7 @@ private TestRun.TestRunOptions createTestRunOptions(String suiteName, SuiteTestR testRunOptions.extraOptions = suiteTestRun.getExtraOptions(); testRunOptions.testArguments = suiteTestRun.getTemptoRunArguments(); testRunOptions.testJar = testJar; - testRunOptions.reportsDir = Paths.get(format("presto-product-tests/target/%s/%s/%s", suiteName, environmentConfig.getConfigName(), suiteTestRun.getEnvironmentName())); + testRunOptions.reportsDir = Paths.get(format("testing/trino-product-tests/target/%s/%s/%s", suiteName, environmentConfig.getConfigName(), suiteTestRun.getEnvironmentName())); testRunOptions.startupRetries = null; testRunOptions.logsDirBase = Optional.empty(); return testRunOptions; diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java index 48143a9f1fb4..05cb62341a26 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/SuiteRun.java @@ -311,7 +311,7 @@ private TestRun.TestRunOptions createTestRunOptions(String runId, String suiteNa testRunOptions.testJar = suiteRunOptions.testJar; testRunOptions.cliJar = suiteRunOptions.cliJar; String suiteRunId = suiteRunId(runId, suiteName, suiteTestRun, environmentConfig); - testRunOptions.reportsDir = Paths.get("presto-product-tests/target/reports/" + suiteRunId); + testRunOptions.reportsDir = Paths.get("testing/trino-product-tests/target/reports/" + suiteRunId); testRunOptions.logsDirBase = logsDirBase.map(dir -> dir.resolve(suiteRunId)); // Calculate remaining time testRunOptions.timeout = remainingTimeout();