ensure install folder for sub package is suffixed with runmode as well

Author: stefanseifert

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java

@@ -380,7 +380,11 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
                 }
                 File resultSubPackageFile = processContentPackage(tempSubPackageFile, pkg, null, environmentRunMode, allPackagesFromFileSets);
                 try (FileInputStream subPackageFis = new FileInputStream(resultSubPackageFile)) {
-                  ZipEntry zipOutEntry = new ZipEntry(path + basename + runModeSuffix + ".zip");
+                  // add runmode suffix to install path and to filename
+                  String newPath = StringUtils.removeEnd(path, "/") + runModeSuffix + "/"
+                      + basename + runModeSuffix + ".zip";
+
+                  ZipEntry zipOutEntry = new ZipEntry(newPath);
                   zipOut.putNextEntry(zipOutEntry);
                   IOUtils.copy(subPackageFis, zipOut);
                 }

tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderTest.java

@@ -138,7 +138,7 @@ void testBuild(Set<String> cloudManagerTarget, List<String> runmodeSuffixes) thr
       assertNameDependencies(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
           "accesscontroltool-package" + runmodeSuffix);
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
-          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
+          "jcr_root/apps/netcentric/actool/install" + runmodeSuffix + "/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
           "accesscontroltool-apps-package" + runmodeSuffix);
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
           "wcm-io-samples-aem-cms-config" + runmodeSuffix);
@@ -215,7 +215,7 @@ void testBuild_IMMUTABLE_MUTABLE_COMBINED(Set<String> cloudManagerTarget, List<S
           "accesscontroltool-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.content" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
-          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
+          "jcr_root/apps/netcentric/actool/install" + runmodeSuffix + "/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
           "accesscontroltool-apps-package" + runmodeSuffix);
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
           "wcm-io-samples-aem-cms-config" + runmodeSuffix,
@@ -293,7 +293,7 @@ void testBuild_IMMUTABLE_MUTABLE_SEPARATE(Set<String> cloudManagerTarget, List<S
           "accesscontroltool-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
-          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
+          "jcr_root/apps/netcentric/actool/install" + runmodeSuffix + "/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
           "accesscontroltool-apps-package" + runmodeSuffix);
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
           "wcm-io-samples-aem-cms-config" + runmodeSuffix,
@@ -369,7 +369,7 @@ void testBuild_IMMUTABLE_ONLY(Set<String> cloudManagerTarget, List<String> runmo
           "accesscontroltool-package" + runmodeSuffix,
           "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
-          "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
+          "jcr_root/apps/netcentric/actool/install" + runmodeSuffix + "/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
           "accesscontroltool-apps-package" + runmodeSuffix);
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
           "wcm-io-samples-aem-cms-config" + runmodeSuffix,