Skip to content

Commit 1c26fae

Browse files
committed
Fix upload_artifacts.sh shell script to work with both BSD and Posix style sed options
1 parent aa63577 commit 1c26fae

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

scheduler_plugins/slurm/utils/upload_artifacts.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ function usage {
1919
exit 1
2020
}
2121

22+
BUILD_OS=$(uname)
23+
if [ "${BUILD_OS}" != "Linux" ]; then
24+
SED_BAK_EXT="''"
25+
fi
26+
2227
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
2328
cd "${SCRIPT_DIR}/.."
2429

@@ -74,18 +79,18 @@ PLUGIN_ARTIFACTS_CHECKSUM=$(shasum --algorithm 256 "${PLUGIN_ARTIFACTS_ARCHIVE}"
7479
PLUGIN_DEFINITION_S3_URL="s3://${S3_BUCKET}${S3_BUCKET_PREFIX}/plugin_definition.yaml"
7580
GENERATED_PLUGIN_DEFINITION_PATH="${TMP}/plugin_template_plugin_definition.yaml"
7681
cp plugin_definition.yaml ${GENERATED_PLUGIN_DEFINITION_PATH}
77-
sed -i "s|<TEMPLATE_CHECKSUM>|${ADDITIONAL_CLUSTER_INFRASTRUCTURE_CHECKSUM}|g" ${GENERATED_PLUGIN_DEFINITION_PATH}
78-
sed -i "s|<ARTIFACTS_CHECKSUM>|${PLUGIN_ARTIFACTS_CHECKSUM}|g" ${GENERATED_PLUGIN_DEFINITION_PATH}
79-
sed -i "s|<BUCKET>|${S3_BUCKET}${S3_BUCKET_PREFIX}|g" ${GENERATED_PLUGIN_DEFINITION_PATH}
82+
sed -i $SED_BAK_EXT "s|<TEMPLATE_CHECKSUM>|${ADDITIONAL_CLUSTER_INFRASTRUCTURE_CHECKSUM}|g" ${GENERATED_PLUGIN_DEFINITION_PATH}
83+
sed -i $SED_BAK_EXT "s|<ARTIFACTS_CHECKSUM>|${PLUGIN_ARTIFACTS_CHECKSUM}|g" ${GENERATED_PLUGIN_DEFINITION_PATH}
84+
sed -i $SED_BAK_EXT "s|<BUCKET>|${S3_BUCKET}${S3_BUCKET_PREFIX}|g" ${GENERATED_PLUGIN_DEFINITION_PATH}
8085
echo "Generated plugin definition:" && cat ${GENERATED_PLUGIN_DEFINITION_PATH}
8186
echo "Uploading plugin_definition to ${PLUGIN_DEFINITION_S3_URL}"
8287
aws s3 cp --region "${AWS_REGION}" "${GENERATED_PLUGIN_DEFINITION_PATH}" "${PLUGIN_DEFINITION_S3_URL}"
8388

8489
GENERATED_CONFIG_PATH="${TMP}/slurm_plugin_cluster_config.yaml"
8590
cp examples/cluster_configuration.yaml ${GENERATED_CONFIG_PATH}
86-
sed -i "s|<PLUGIN_DEFINITION>|${PLUGIN_DEFINITION_S3_URL}|g" ${GENERATED_CONFIG_PATH}
91+
sed -i $SED_BAK_EXT "s|<PLUGIN_DEFINITION>|${PLUGIN_DEFINITION_S3_URL}|g" ${GENERATED_CONFIG_PATH}
8792
PLUGIN_DEFINITION_CHECKSUM=$(shasum --algorithm 256 "${GENERATED_PLUGIN_DEFINITION_PATH}" | cut -d' ' -f1)
88-
sed -i "s|<PLUGIN_DEFINITION_CHECKSUM>|${PLUGIN_DEFINITION_CHECKSUM}|g" ${GENERATED_CONFIG_PATH}
93+
sed -i $SED_BAK_EXT "s|<PLUGIN_DEFINITION_CHECKSUM>|${PLUGIN_DEFINITION_CHECKSUM}|g" ${GENERATED_CONFIG_PATH}
8994

9095
echo "Generated test cluster configuration in ${GENERATED_CONFIG_PATH}:"
9196
cat ${GENERATED_CONFIG_PATH}

0 commit comments

Comments
 (0)