Misc. weekly build updates

configs/sites/tier1/acorn/packages.yaml

@@ -25,8 +25,6 @@ packages:
   #
   ### Individual package settings
   #
-  curl:
-    require: ['~nghttp2']
   flex:
     require: ['@2.6.4']
   gdal:

util/weekly_build/03_SetupEnv.sh

@@ -27,6 +27,6 @@ for compiler in $COMPILERS; do
     fi
     # Check for duplicates and fail before doing the "real" concretization:
     spack_wrapper log.concretize concretize --fresh
-    ${SPACK_STACK_DIR:?}/util/show_duplicate_packages.py -i crtm-fix -i crtm -i esmf -i mapl -i neptune-env
+    ${SPACK_STACK_DIR:?}/util/show_duplicate_packages.py -i crtm-fix -i crtm -i esmf -i mapl -i neptune-env -i py-setuptools-scm
   done
 done

util/weekly_build/05_BuildCache.sh

@@ -2,6 +2,8 @@
 
 set -ex
 
+if [ "$PUSH_TO_BUILDCACHE" == NO ]; then return 0 ; fi
+
 if [ -z $SETUPDONE ]; then . ShellSetup.sh $* ; fi
 
 cd $RUNDIR/$RUNID

util/weekly_build/07_Cleanup.sh

@@ -5,6 +5,7 @@ set -ex
 if [ -z $SETUPDONE ]; then . ShellSetup.sh $* ; fi
 
 if [ "$KEEP_WEEKLY_BUILD_DIR" != YES ]; then
+  chmod u+w ${RUNDIR:?}/${RUNID:?} -R
   /usr/bin/rm -rf ${RUNDIR:?}/${RUNID:?}
 else
   ${FIND_CMD} ${RUNDIR:?}/${RUNID:?} -type f -print0 | xargs -0 touch

util/weekly_build/sites/acorn.sh

@@ -2,21 +2,23 @@ if [ ! -z $SPACK_STACK_DIR ]; then
   . ${SPACK_STACK_DIR}/configs/sites/tier1/wcoss2/setup.sh
 fi
 
-COMPILERS=${COMPILERS:-"oneapi@2024.2.1 intel@19.1.3.304"}
+COMPILERS=${COMPILERS:-"oneapi-2024.2.1 intel-19.1.3.304"}
 TEMPLATES=${TEMPLATES:-"unified-dev"}
 function spack_install_wrapper {
   logfile=$1
   shift 2
-  spack fetch --missing ${PACKAGES_TO_INSTALL} &> log.fetch
-  if [[ " $($(which spack) dependencies --transitive ${PACKAGES_TO_INSTALL}) " =~ " go " ]]; then
-    /opt/pbs/bin/qsub -N spack-build-cache-$RUNID -j oe -A NCEPLIBS-DEV -l "select=1:ncpus=8:mem=20GB,walltime=$walltime" -q dev -V -Wblock=true -- $(which spack) install go
+  spack fetch --missing --no-checksum ${PACKAGES_TO_INSTALL} &> log.fetch
+  if [[ $(spack spec ${PACKAGES_TO_INSTALL} | grep -Pc '(?<=[\s\^])go(?=@)') -gt 0 ]]; then
+    if [ "$REUSE_BUILD_CACHE" == YES ]; then cache_flag="--no-check-signature"; else cache_flag="--no-cache"; fi
+    /opt/pbs/bin/qsub -N spack-build-cache-$RUNID -j oe -A NCEPLIBS-DEV -l "select=1:ncpus=8:mem=20GB,walltime=00:45:00" -q dev -V -Wblock=true -- $(which spack) install $cache_flag go
     ${SPACK_SPACK_DIR}/util/fetch_go_deps.py
+    chmod u+rX ${GOMODCACHE}/cache -R
   fi
   spack config add 'config:build_stage:$tempdir/$user/spack-stage'
-  if [[ " $* " =~ "-env " ]]; then # for the "real" install step
-    walltime=03:30:00
+  if [[ " $* " =~ "-env " || -z $PACKAGES_TO_TEST ]]; then # for the "real" install step
+    walltime=${INSTALL_WALLTIME:-03:30:00}
   else # when running test step
-    walltime=01:00:00
+    walltime=${TEST_WALLTIME:-01:00:00}
   fi
   if [ "$SINGLE_NODE" == YES ]; then
     spack config add 'config:locks:false'
@@ -30,8 +32,8 @@ function alert_cmd {
   module purge # annoying libstdc++ issue
   mail -s 'spack-stack weekly build failure' alexander.richert@noaa.gov  < <(echo "Weekly spack-stack build failed in $1. Run ID: $RUNID")
 }
-PACKAGES_TO_TEST="libpng libaec jasper w3emc g2c netcdf-c netcdf-fortran bufr g2 bacio ip g2tmpl nemsio sigio ncio"
-PACKAGES_TO_INSTALL="ufs-weather-model-env global-workflow-env gsi-env madis"
+PACKAGES_TO_TEST=${PACKAGES_TO_TEST:-"libpng libaec jasper w3emc g2c netcdf-c netcdf-fortran bufr g2 bacio ip g2tmpl nemsio sigio ncio"}
+PACKAGES_TO_INSTALL=${PACKAGES_TO_INSTALL:-"ufs-weather-model-env global-workflow-env gsi-env madis"}
 PADDED_LENGTH=140
 TEST_UFSWM=OFF
 BATCHACCOUNT=NCEPLIBS-DEV