Adding ACL option to archive_build.sh

archive_build.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to archive build results.  Used by the buildbots.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 21 matching lines @@
 DEFINE_boolean official_build $FLAGS_FALSE "Set CHROMEOS_OFFICIAL=1 for release builds."
 DEFINE_string build_number "" \
     "The build-bot build number (when called by buildbot only)." "b"
 DEFINE_boolean test_mod $FLAGS_TRUE "Modify image for testing purposes"
 DEFINE_boolean factory_test_mod $FLAGS_FALSE \
     "Modify image for factory testing purposes"
 DEFINE_boolean factory_install_mod $FLAGS_FALSE \
     "Modify image for factory install purposes"
 DEFINE_string gsutil "gsutil" \
     "Location of gsutil"
+DEFINE_string gsd_gen_index "" \
+    "Location of gsd_generate_index.py"
+DEFINE_string acl "private" \
+    "ACL to set on GSD archives"
 DEFINE_string gsutil_archive "" \
     "Optional datastore archive location"
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Set if default from path is used
 DEFAULT_USED=
 
@@ skipping 121 matching lines @@
 fi
 cd -
 
 # Update LATEST file
 echo "$LAST_CHANGE" > "${FLAGS_to}/LATEST"
 
 # Make sure files are readable
 chmod 644 "$ZIPFILE" "${FLAGS_to}/LATEST"
 chmod 755 "$OUTDIR"
 
+
+GSUTIL_CP="${FLAGS_gsutil} cp -a ${FLAGS_acl}"
+GSUTIL_GENERATE_INDEX="${FLAGS_gsd_gen_index} -a ${FLAGS_acl}"
+
+function gsutil_archive() {
+  IN_PATH="$1"
+  OUT_PATH="$2"
+  if [ $FLAGS_gsutil_archive != "" ]
+  then
+    FULL_OUT_PATH="${FLAGS_gsutil_archive}/${OUT_PATH}"
+    echo "Using gsutil to archive to ${OUT_PATH}..."
+    ${GSUTIL_CP} ${IN_PATH} ${FULL_OUT_PATH}
+    if [ $FLAGS_gsd_gen_index != "" ]
+    then
+      echo "Updating indexes..."
+      ${GSD_GENERATE_INDEX} -p ${FULL_OUT_PATH} ${FLAGS_gsutil_archive}
+    fi
+  fi
+}
+
 if [ $FLAGS_test_mod -eq $FLAGS_TRUE -a $FLAGS_official_build -eq $FLAGS_TRUE ]
 then
   echo "Creating hwqual archive"
   HWQUAL_NAME="chromeos-hwqual-${FLAGS_board}-${CHROMEOS_VERSION_STRING}"
   "${SCRIPTS_DIR}/archive_hwqual" --from "${OUTDIR}" \
     --output_tag "${HWQUAL_NAME}"
-  # Optionally archive with gsutil hwqual.
-  if [ $FLAGS_gsutil_archive != "" ]
-  then
-    GS_OUTDIR="${FLAGS_gsutil_archive}/${LAST_CHANGE}"
-    GS_HWQUAL_IN="${OUTDIR}/${HWQUAL_NAME}.tar.bz2"
-    GS_HWQUAL_OUT="${GS_OUTDIR}/${HWQUAL_NAME}.tar.bz2"
-    echo "Using gsutil to archive to ${GS_HWQUAL_OUT}..."
-    ${FLAGS_gsutil} cp ${GS_HWQUAL_IN} ${GS_HWQUAL_OUT}
-  fi
+  gsutil_archive "${OUTDIR}/${HWQUAL_NAME}.tar.bz2" \
+    "${LAST_CHANGE}/${HWQUAL_NAME}.tar.bz2"
 fi
 
-# Optionally archive to Google Storage for Developers.
-if [ $FLAGS_gsutil_archive != "" ]
+gsutil_archive "${ZIPFILE}" "${LAST_CHANGE}/${FLAGS_zipname}"
+if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ] || \
+   [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]
 then
-  GS_OUTDIR="${FLAGS_gsutil_archive}/${LAST_CHANGE}"
-  GS_ZIPFILE="${GS_OUTDIR}/${FLAGS_zipname}"
-  GS_FACTORY_ZIPFILE="${GS_OUTDIR}/factory_${FLAGS_zipname}"
-  GS_LATEST="${FLAGS_gsutil_archive}/LATEST"
-  echo "Using gsutil to archive to ${GS_ZIPFILE}..."
-  ${FLAGS_gsutil} cp ${ZIPFILE} ${GS_ZIPFILE}
-
-  if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ] || \
-     [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]
-  then
-    echo "Using gsutil to archive to ${GS_FACTORY_ZIPFILE}..."
-    ${FLAGS_gsutil} cp ${FACTORY_ZIPFILE} ${GS_FACTORY_ZIPFILE}
-  fi
-
-  echo "Updating latest ${GS_LATEST}..."
-  ${FLAGS_gsutil} cp ${FLAGS_to}/LATEST ${GS_LATEST}
+  gsutil_archive "${FACTORY_ZIPFILE}" \
+    "${LAST_CHANGE}/factory_${FLAGS_zipname}"
 fi
+gsutil_archive "${FLAGS_to}/LATEST" "LATEST"
 
 # Purge old builds if necessary
 if [ $FLAGS_keep_max -gt 0 ]
 then
   echo "Deleting old builds (all but the newest ${FLAGS_keep_max})..."
   cd "$FLAGS_to"
   # +2 because line numbers start at 1 and need to skip LATEST file
   rm -rf `ls -t1 | tail --lines=+$(($FLAGS_keep_max + 2))`
   cd -
 fi
 
 echo "Done."