From 2549276cb5aec4d4dac6534c221b4474134e5173 Mon Sep 17 00:00:00 2001 From: Scott Froberg Date: Wed, 28 Feb 2024 14:42:03 -0500 Subject: [PATCH] [OPENJDK-2807]Update testlib for chance issue with 1001 showing up in the hash. --- containersQa/testlib.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/containersQa/testlib.bash b/containersQa/testlib.bash index 71d10fe..99e2eed 100644 --- a/containersQa/testlib.bash +++ b/containersQa/testlib.bash @@ -534,14 +534,14 @@ function s2iLocal() { # defined in the calling function if it is attempting to build a Jenkins plug-in. if [[ "$JENKINS_BUILD" == "yes" ]] ; then # copy the jenkins settings file to the local tmp directory - $s2iBin build -e "$MAIN" -e "$ARGS" -e "$SETTING_ARGS" "$REPO" "$HASH" "$NAME" --as-dockerfile $DF.orig + $s2iBin build -e "$MAIN" -e "$ARGS" -e "$SETTING_ARGS" "$REPO" "$HASH" "$NAME" --assemble-user $USERNAME --as-dockerfile $DF.orig cp $LIBCQA_SCRIPT_DIR/jenkins_settings.xml upload/src else - $s2iBin build -e "$MAIN" -e "$ARGS" "$REPO" "$HASH" "$NAME" --as-dockerfile $DF.orig + $s2iBin build -e "$MAIN" -e "$ARGS" "$REPO" "$HASH" "$NAME" --assemble-user $USERNAME --as-dockerfile $DF.orig fi if [ "x$OVERWRITE_USER" == x ] ; then #update the container file for proper functionality - cat $DF.orig | sed "s;/usr/libexec;/usr/local;g" | sed "s;1001:0;$USERNAME:$USERNAME;g" | sed "s;1001;$USERNAME;g" | sed "s;/s2i/run;/s2i/run $ADDS;g;" > $DF.nw1 + cat $DF.orig | sed "s;/usr/libexec;/usr/local;g" | sed "s;1001:0;$USERNAME:$USERNAME;g" | sed "s;/s2i/run;/s2i/run $ADDS;g;" > $DF.nw1 else cat $DF.orig | sed "s;/s2i/run;/s2i/run $ADDS;g;" > $DF.nw1 fi