Merge pull request #470 from jmtd/OPENJDK-2824-binary-copy-dir-perms

[OPENJDK-2850] assemble: binary: Don't set times on directories

Author: jmtd

modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides

@@ -29,7 +29,12 @@ function maven_s2i_custom_binary_build() {
     binary_dir="${S2I_SOURCE_DIR}"
   fi
   log_info "Copying binaries from ${binary_dir} to ${S2I_TARGET_DEPLOYMENTS_DIR} ..."
-  rsync --archive --out-format='%n' "${binary_dir}"/ "${S2I_TARGET_DEPLOYMENTS_DIR}"
+
+  ( # OPENJDK-2850: use glob (dotglob to match hidden files) to stop rsync altering
+    # timestamps of S2I_TARGET_DEPLOYMENTS_DIR. Don't alter parent shell's dotglob.
+    shopt -s dotglob
+    rsync --archive --out-format='%n' "${binary_dir}"/* "${S2I_TARGET_DEPLOYMENTS_DIR}"
+  )
 }
 
 function maven_s2i_deploy_artifacts_override() {

modules/s2i/core/tests/features/s2i-core.feature

@@ -6,3 +6,14 @@ Feature: Openshift S2I tests
   Scenario: run an s2i build and check that /tmp/src has been removed afterwards
     Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
     Then run stat /tmp/src in container and immediately check its output does not contain File:
+
+    # OPENJDK-2850 - ensure binary-only s2i doesn't try to change timestamps of
+    # S2I_TARGET_DEPLOYMENTS_DIR. Use /var/tmp as a directory where attempting to
+    # will fail. This simulates the s2i process running as a random UID, which can't
+    # change timestamps on the default directory, /deployments.
+  Scenario: Ensure binary-only build doesn't fail trying to set timestamp of S2I_TARGET_DEPLOYMENTS_DIR (OPENJDK-2850)
+      Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from OPENJDK-2408-bin-custom-s2i-assemble with env
+       | variable                   | value |
+       | S2I_TARGET_DEPLOYMENTS_DIR | /var/tmp  |
+     Then s2i build log should not contain rsync: [generator] failed to set permissions on "/var/tmp/.": Operation not permitted
+     And  run stat /var/tmp/spring-boot-sample-simple-1.5.0.BUILD-SNAPSHOT.jar in container and check its output for Access: