From 989988f13121cb1e81bb36d34f251b27c4a9c2f7 Mon Sep 17 00:00:00 2001 From: Tomas Perez Molina Date: Tue, 2 Jun 2026 13:39:48 +0000 Subject: [PATCH 1/2] test: route Tomcat download through MASS staging to validate HEAD fix --- .../application/build.gradle | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/dd-smoke-tests/springboot-tomcat/application/build.gradle b/dd-smoke-tests/springboot-tomcat/application/build.gradle index 923b5d34006..aac6b574363 100644 --- a/dd-smoke-tests/springboot-tomcat/application/build.gradle +++ b/dd-smoke-tests/springboot-tomcat/application/build.gradle @@ -28,9 +28,17 @@ ext { serverExtension = 'zip' } +// Route artifact downloads through MASS staging to validate HEAD support. +// MASS staging: https://mass-read.us1.staging.dog +// DO NOT MERGE — staging validation only. +def massArtifactUrl = { String upstreamArtifactUrl -> + def massReadUrl = 'https://mass-read.us1.staging.dog' + return "${massReadUrl}/internal/artifact/${upstreamArtifactUrl}" +} + repositories { ivy { - url = 'https://dlcdn.apache.org' + url = massArtifactUrl('dlcdn.apache.org') patternLayout { artifact '/[organisation]/[module]/v[revision]/bin/apache-[organisation]-[revision].[ext]' } @@ -58,32 +66,3 @@ dependencies { tasks.register("unzip", Copy) { def zipFileNamePrefix = "tomcat" - def serverZipTree = providers.provider { - // eager access - def zipPath = project.configurations.serverFile.find { - it.name.startsWith(zipFileNamePrefix) - } - if (zipPath == null) { - throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix) - } - zipTree(zipPath) - } - - from serverZipTree - into layout.buildDirectory - - // When tests are disabled this would still be run, so disable this manually - onlyIf { !project.rootProject.hasProperty("skipTests") } -} - -tasks.named('bootWar') { - dependsOn 'unzip' -} - -tasks.named('bootWarMainClassName') { - dependsOn 'unzip' -} - -tasks.named('war') { - dependsOn 'unzip' -} From 945edf81bd4831604f1fc32a12e587811f31b52f Mon Sep 17 00:00:00 2001 From: Tomas Perez Molina Date: Tue, 2 Jun 2026 13:49:16 +0000 Subject: [PATCH 2/2] fix: restore full file, minimal diff only (massArtifactUrl + url swap) --- .../application/build.gradle | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dd-smoke-tests/springboot-tomcat/application/build.gradle b/dd-smoke-tests/springboot-tomcat/application/build.gradle index aac6b574363..9987bda6d56 100644 --- a/dd-smoke-tests/springboot-tomcat/application/build.gradle +++ b/dd-smoke-tests/springboot-tomcat/application/build.gradle @@ -29,7 +29,6 @@ ext { } // Route artifact downloads through MASS staging to validate HEAD support. -// MASS staging: https://mass-read.us1.staging.dog // DO NOT MERGE — staging validation only. def massArtifactUrl = { String upstreamArtifactUrl -> def massReadUrl = 'https://mass-read.us1.staging.dog' @@ -66,3 +65,32 @@ dependencies { tasks.register("unzip", Copy) { def zipFileNamePrefix = "tomcat" + def serverZipTree = providers.provider { + // eager access + def zipPath = project.configurations.serverFile.find { + it.name.startsWith(zipFileNamePrefix) + } + if (zipPath == null) { + throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix) + } + zipTree(zipPath) + } + + from serverZipTree + into layout.buildDirectory + + // When tests are disabled this would still be run, so disable this manually + onlyIf { !project.rootProject.hasProperty("skipTests") } +} + +tasks.named('bootWar') { + dependsOn 'unzip' +} + +tasks.named('bootWarMainClassName') { + dependsOn 'unzip' +} + +tasks.named('war') { + dependsOn 'unzip' +}