From d8947c07fe2d1c652b5bc1f84ab128f03a3496a2 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 12 Aug 2025 14:12:21 -0400 Subject: [PATCH 1/6] Fix for play-2.8 'Source directory xxx is not a directory.` --- dd-smoke-tests/play-2.8/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle index f1cdd480ede..749b3a971e9 100644 --- a/dd-smoke-tests/play-2.8/build.gradle +++ b/dd-smoke-tests/play-2.8/build.gradle @@ -91,7 +91,7 @@ tasks.register('fixPlayRoutesDirectory') { } } -tasks.named('compilePlayRoutes') { +tasks.named('processResources') { dependsOn tasks.named('fixPlayRoutesDirectory') } From 07519854009ef075740e0b5447e3259da6df6149 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 12 Aug 2025 14:28:05 -0400 Subject: [PATCH 2/6] Run SSI smoke tests. --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d1d8304721..9e13172e3c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -703,7 +703,6 @@ test_smoke: test_ssi_smoke: extends: .test_job - rules: *master_only variables: GRADLE_TARGET: "stageMainDist :smokeTest" CACHE_TYPE: "smoke" From f452d3be5d674f2c134bda3ad93f90b7e68f221c Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 12 Aug 2025 18:38:45 -0400 Subject: [PATCH 3/6] Trying to reproduce. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e13172e3c2..a135102cf3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -711,6 +711,7 @@ test_ssi_smoke: parallel: matrix: *test_matrix_4 + test_smoke_graalvm: extends: .test_job tags: [ "arch:amd64" ] From 711f0dacb8a0676968a49f54309c652b0fcaf2e7 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 13 Aug 2025 10:32:19 -0400 Subject: [PATCH 4/6] Reverted test changes. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a135102cf3e..9d1d8304721 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -703,6 +703,7 @@ test_smoke: test_ssi_smoke: extends: .test_job + rules: *master_only variables: GRADLE_TARGET: "stageMainDist :smokeTest" CACHE_TYPE: "smoke" @@ -711,7 +712,6 @@ test_ssi_smoke: parallel: matrix: *test_matrix_4 - test_smoke_graalvm: extends: .test_job tags: [ "arch:amd64" ] From c6ec63517a643e4a553cf2155eba3fdcb8272b98 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 13 Aug 2025 11:16:39 -0400 Subject: [PATCH 5/6] Refactored fix to be reusable from several modules. --- .../play-2.8-split-routes/build.gradle | 3 ++- dd-smoke-tests/play-2.8/build.gradle | 24 +------------------ gradle/fix-play-routes.gradle | 22 +++++++++++++++++ 3 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 gradle/fix-play-routes.gradle diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle index 3c540f3f436..d65727d6bdd 100644 --- a/dd-smoke-tests/play-2.8-split-routes/build.gradle +++ b/dd-smoke-tests/play-2.8-split-routes/build.gradle @@ -3,6 +3,7 @@ plugins { } apply from: "$rootDir/gradle/java.gradle" +apply from: "$rootDir/gradle/fix-play-routes.gradle" def playVer = "2.8.15" def scalaVer = System.getProperty("scala.version", /* default = */ "2.13") @@ -66,7 +67,7 @@ dependencies { } configurations.testImplementation { - exclude group:'com.typesafe.play', module:"play-test_$scalaVer" + exclude group: 'com.typesafe.play', module: "play-test_$scalaVer" } tasks.named('compileTestGroovy').configure { diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle index 749b3a971e9..bdfeffb0350 100644 --- a/dd-smoke-tests/play-2.8/build.gradle +++ b/dd-smoke-tests/play-2.8/build.gradle @@ -3,6 +3,7 @@ plugins { } apply from: "$rootDir/gradle/java.gradle" +apply from: "$rootDir/gradle/fix-play-routes.gradle" def playVer = "2.8.15" def scalaVer = System.getProperty("scala.version", /* default = */ "2.13") @@ -72,29 +73,6 @@ configurations.testImplementation { exclude group: 'com.typesafe.play', module: "play-test_$scalaVer" } -// Fix for flaky error: Source directory '/dd-smoke-tests/play-2.8/build/src/play/routes' is not a directory. -// Probably, GitLab somehow creates (or restores from cache) file instead of folder. -tasks.register('fixPlayRoutesDirectory') { - group = 'build cleanup' - description = 'Deletes routes path if it is a file instead of directory' - - def routesPath = layout.buildDirectory.dir('src/play/routes') - destroyables.register(routesPath) - - doFirst { - def routesPathFile = routesPath.get().asFile - - if (routesPathFile.exists() && !routesPathFile.isDirectory()) { - logger.lifecycle("Removing file that blocks routes directory: ${routesPathFile}") - project.delete(routesPathFile) - } - } -} - -tasks.named('processResources') { - dependsOn tasks.named('fixPlayRoutesDirectory') -} - tasks.named('compileTestGroovy').configure { dependsOn 'stageMainDist' outputs.upToDateWhen { diff --git a/gradle/fix-play-routes.gradle b/gradle/fix-play-routes.gradle new file mode 100644 index 00000000000..79b3b180d36 --- /dev/null +++ b/gradle/fix-play-routes.gradle @@ -0,0 +1,22 @@ +// Fix for flaky error: Source directory '/dd-smoke-tests/play-2.8/build/src/play/routes' is not a directory. +// Probably, GitLab somehow creates (or restores from cache) file instead of folder. +tasks.register('fixPlayRoutesDirectory') { + group = 'build cleanup' + description = 'Deletes routes path if it is a file instead of directory' + + def routesPath = layout.buildDirectory.dir('src/play/routes') + destroyables.register(routesPath) + + doFirst { + def routesPathFile = routesPath.get().asFile + + if (routesPathFile.exists() && !routesPathFile.isDirectory()) { + logger.lifecycle("Removing file that blocks routes directory: ${routesPathFile}") + project.delete(routesPathFile) + } + } +} + +tasks.named('processResources') { + dependsOn tasks.named('fixPlayRoutesDirectory') +} From da12ecd8d11c44504125ae44890ddf2aacb1ef72 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 14 Aug 2025 09:43:43 -0400 Subject: [PATCH 6/6] Moved script to `play-common` folder. --- dd-smoke-tests/play-2.8-split-routes/build.gradle | 2 +- dd-smoke-tests/play-2.8/build.gradle | 2 +- {gradle => dd-smoke-tests/play-common}/fix-play-routes.gradle | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {gradle => dd-smoke-tests/play-common}/fix-play-routes.gradle (100%) diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle index d65727d6bdd..c5ef21ab5df 100644 --- a/dd-smoke-tests/play-2.8-split-routes/build.gradle +++ b/dd-smoke-tests/play-2.8-split-routes/build.gradle @@ -3,7 +3,7 @@ plugins { } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/fix-play-routes.gradle" +apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-routes.gradle" def playVer = "2.8.15" def scalaVer = System.getProperty("scala.version", /* default = */ "2.13") diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle index bdfeffb0350..2878364f2ef 100644 --- a/dd-smoke-tests/play-2.8/build.gradle +++ b/dd-smoke-tests/play-2.8/build.gradle @@ -3,7 +3,7 @@ plugins { } apply from: "$rootDir/gradle/java.gradle" -apply from: "$rootDir/gradle/fix-play-routes.gradle" +apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-routes.gradle" def playVer = "2.8.15" def scalaVer = System.getProperty("scala.version", /* default = */ "2.13") diff --git a/gradle/fix-play-routes.gradle b/dd-smoke-tests/play-common/fix-play-routes.gradle similarity index 100% rename from gradle/fix-play-routes.gradle rename to dd-smoke-tests/play-common/fix-play-routes.gradle