pass list of accelerators to create_tarball

Author: bedroge

bot/build.sh

@@ -332,6 +332,6 @@ echo "Executing command to create tarball:"
 echo "$software_layer_dir/eessi_container.sh ${COMMON_ARGS[@]} ${TARBALL_STEP_ARGS[@]}"
 echo "                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET_OVERRIDES[@]}\" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr}"
 $software_layer_dir/eessi_container.sh "${COMMON_ARGS[@]}" "${TARBALL_STEP_ARGS[@]}" \
-                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET_OVERRIDES[@]}\" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr}
+                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET_OVERRIDES[*]}" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr}
 
 exit 0

create_tarball.sh

@@ -11,7 +11,7 @@ fi
 eessi_tmpdir=$1
 eessi_version=$2
 cpu_arch_subdir=$3
-accel_subdir=$4
+accel_subdirs=$4
 target_tarball=$5
 
 tmpdir=`mktemp -d`
@@ -64,8 +64,12 @@ fi
 
 # consider both CPU-only and accelerator subdirectories (if an accelerator was configured)
 sw_subdirs=${cpu_arch_subdir}
-if [ -n "${accel_subdir}" ]; then
-    sw_subdirs="${sw_subdirs} ${cpu_arch_subdir}/${accel_subdir}"
+if [ -n "${accel_subdirs}" ]; then
+    # convert accel_subdirs into an array...
+    read -r -a accel_subdirs <<< ${accel_subdirs}
+    # and prepend the cpu_arch_subdir to all elements
+    accel_subdirs="${accel_subdirs[@]/#/${cpu_arch_subdir}/}"
+    sw_subdirs="${sw_subdirs} ${accel_subdirs[@]}"
 fi
 for subdir in ${sw_subdirs}; do