Revert "WIP"

This reverts commit 4d86b3e.
elastic · Jan 25, 2024 · 0f953f1 · 0f953f1
1 parent bc0e58f
commit 0f953f1
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 120,279 deletions.
diff --git a/...s-internal/src/main/java/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTar.java b/...s-internal/src/main/java/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTar.java
@@ -101,17 +101,12 @@ private class SymbolicLinkPreservingTarStreamAction implements CopyActionProcess
 
             @Override
             public void processFile(final FileCopyDetailsInternal details) {
-                System.out.println("details.getName() = " + details.getRelativePath() + "/ --- " + details.getPermissions().toUnixNumeric());
                 if (isChildOfVisitedSymbolicLink(details) == false) {
                     if (isSymbolicLink(details)) {
-                        System.out.println("   visitSymbolicLink(details)");
                         visitSymbolicLink(details);
-
                     } else if (details.isDirectory()) {
-                        System.out.println("   visitDirectory(details)");
                         visitDirectory(details);
                     } else {
-                        System.out.println("   visitFile(details)");
                         visitFile(details);
                     }
                 }
@@ -163,7 +158,6 @@ private void visitSymbolicLink(final FileCopyDetailsInternal details) {
             private void visitDirectory(final FileCopyDetailsInternal details) {
                 final TarArchiveEntry entry = new TarArchiveEntry(details.getRelativePath().getPathString() + "/");
                 entry.setModTime(getModTime(details));
-                System.out.println("    entry.getMode() = " + details.getMode());
                 entry.setMode(UnixStat.DIR_FLAG | details.getMode());
                 try {
                     tar.putArchiveEntry(entry);

diff --git a/output-85.log b/output-85.log
diff --git a/output-86.log b/output-86.log
diff --git a/output.log b/output.log
diff --git a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/Archives.java b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/Archives.java
@@ -49,7 +49,7 @@ public class Archives {
     protected static final Logger logger = LogManager.getLogger(Archives.class);
 
     // in the future we'll run as a role user on Windows
-    public static final String ARCHIVE_OWNER = Platforms.WINDOWS ? System.getenv("username") : "rene";
+    public static final String ARCHIVE_OWNER = Platforms.WINDOWS ? System.getenv("username") : "elasticsearch";
 
     public static Installation installArchive(Shell sh, Distribution distribution) throws Exception {
         return installArchive(sh, distribution, getDefaultArchiveInstallPath(), getCurrentVersion(), false);
@@ -159,13 +159,12 @@ public static void verifyArchiveInstallation(Installation installation, Distribu
     }
 
     private static void verifyOssInstallation(Installation es, Distribution distribution, String owner) {
-        Stream.of(es.config).forEach(dir -> assertThat(dir, file(Directory, owner, "wheel", p755)));
-        Stream.of(es.home, es.config, es.plugins, es.modules, es.logs).forEach(dir -> assertThat(dir, file(Directory, owner, "wheel", p755)));
+        Stream.of(es.home, es.config, es.plugins, es.modules, es.logs).forEach(dir -> assertThat(dir, file(Directory, owner, owner, p755)));
 
         assertThat(Files.exists(es.data), is(false));
 
-        assertThat(es.bin, file(Directory, owner, "wheel", p755));
-        assertThat(es.lib, file(Directory, owner, "wheel", p755));
+        assertThat(es.bin, file(Directory, owner, owner, p755));
+        assertThat(es.lib, file(Directory, owner, owner, p755));
         assertThat(Files.exists(es.config("elasticsearch.keystore")), is(false));
 
         Stream.of(

diff --git a/tar-output-85.log b/tar-output-85.log
diff --git a/tar-output-86.log b/tar-output-86.log