Ensure we verify versioned dir for es bwc builds (#66590)

Update according integ tests

Author: breskeby

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy

@@ -110,7 +110,10 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
             inputs.files(configurations.expandedDist)
             doLast {
                 configurations.expandedDist.files.each {
-                    println "distfile " + (it.absolutePath - project.rootDir.absolutePath)
+                    println "expandedRootPath " + (it.absolutePath - project.rootDir.absolutePath)
+                    it.eachFile { nested ->
+                        println "nested folder " + (nested.absolutePath - project.rootDir.absolutePath)
+                    }
                 }
             }
         }
@@ -123,11 +126,13 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
         then:
         result.task(":resolveExpandedDistribution").outcome == TaskOutcome.SUCCESS
         result.task(":distribution:bwc:minor:buildBwcDarwinTar").outcome == TaskOutcome.SUCCESS
-
         and: "assemble task triggered"
         result.output.contains("[7.11.0] > Task :distribution:archives:darwin-tar:extractedAssemble")
         normalized(result.output)
-                .contains("distfile /distribution/bwc/minor/build/bwc/checkout-7.x/" +
+                .contains("expandedRootPath /distribution/bwc/minor/build/bwc/checkout-7.x/" +
                         "distribution/archives/darwin-tar/build/install")
+        normalized(result.output)
+                .contains("nested folder /distribution/bwc/minor/build/bwc/checkout-7.x/" +
+                        "distribution/archives/darwin-tar/build/install/elasticsearch-7.11.0-SNAPSHOT")
     }
 }

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

@@ -213,7 +213,9 @@ static void createBuildBwcTask(
         String bwcTaskName = buildBwcTaskName(projectName);
         bwcSetupExtension.bwcTask(bwcTaskName, c -> {
             boolean useNativeExpanded = projectArtifact.expandedDistDir != null;
-            File expectedOutputFile = useNativeExpanded ? projectArtifact.expandedDistDir : projectArtifact.distFile;
+            File expectedOutputFile = useNativeExpanded
+                ? new File(projectArtifact.expandedDistDir, "elasticsearch-" + bwcVersion.get() + "-SNAPSHOT")
+                : projectArtifact.distFile;
             c.getInputs().file(new File(project.getBuildDir(), "refspec"));
             if (useNativeExpanded) {
                 c.getOutputs().dir(expectedOutputFile);
@@ -279,7 +281,7 @@ private static class DistributionProject {
                         + "."
                         + extension
                 ),
-                expandedDistDirSupport ? new File(checkoutDir, baseDir + "/" + name + "/build/install/") : null
+                expandedDistDirSupport ? new File(checkoutDir, baseDir + "/" + name + "/build/install") : null
             );
         }