From 0e7012d1f336ce44561104c8e7c0ef515f9cb004 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Wed, 27 Nov 2024 11:54:43 -0500 Subject: [PATCH] fix: Update to MorphoCloud/MorphoCloudWorkflow@3462608 List of MorphoCloudWorkflow changes: ``` $ git shortlog 7e99a45..3462608 --no-merges Jean-Christophe Fillion-Robin (2): fix(cloud-config): Update to MorphoCloud/exosphere@1d41d03ba fix: Install support files into /opt/instance-config-support ``` See https://github.com/MorphoCloud/MorphoCloudWorkflow/compare/7e99a45...3462608 --- .github/workflows/automatic-instance-shelving.yml | 4 ++-- .github/workflows/create-instance.yml | 2 +- cloud-config | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automatic-instance-shelving.yml b/.github/workflows/automatic-instance-shelving.yml index af92dac4..4db6aa59 100644 --- a/.github/workflows/automatic-instance-shelving.yml +++ b/.github/workflows/automatic-instance-shelving.yml @@ -74,7 +74,7 @@ jobs: -o UserKnownHostsFile=/dev/null \ -o LogLevel=ERROR \ exouser@$instance_ip \ - 'bash -c "[[ -f /home/exouser/dist/check-instance-shelve.sh ]] && echo yes || echo no"' < /dev/null) + 'bash -c "[[ -f /opt/instance-config-support/dist/check-instance-shelve.sh ]] && echo yes || echo no"' < /dev/null) if [[ $? -ne 0 ]]; then echo "::warning ::Failed to check if 'check-instance-shelve.sh' was found on $instance_name using IP $instance_ip" continue @@ -86,7 +86,7 @@ jobs: -o UserKnownHostsFile=/dev/null \ -o LogLevel=ERROR \ exouser@$instance_ip \ - '/home/exouser/dist/check-instance-shelve.sh -d' < /dev/null) + '/opt/instance-config-support/dist/check-instance-shelve.sh -d' < /dev/null) if [[ $? -ne 0 ]]; then echo "::warning ::Failed to retrieve uptime for $instance_name using IP $instance_ip" continue diff --git a/.github/workflows/create-instance.yml b/.github/workflows/create-instance.yml index ac7d2996..d4a1ccb3 100644 --- a/.github/workflows/create-instance.yml +++ b/.github/workflows/create-instance.yml @@ -477,7 +477,7 @@ jobs: -o UserKnownHostsFile=/dev/null \ -o LogLevel=ERROR \ exouser@$INSTANCE_IP \ - '[ ! -d /media/volume/MyData/Slicer ] && mv /media/volume/MyData-tmp/Slicer /media/volume/MyData/Slicer; mv /media/volume/MyData-tmp/dist /media/volume/MyData/dist' + '[ ! -d /media/volume/MyData/Slicer ] && mv /media/volume/MyData-tmp/Slicer /media/volume/MyData/Slicer' env: INSTANCE_IP: ${{ steps.ip_create.outputs.floating_ip_address }} diff --git a/cloud-config b/cloud-config index dd124e8a..c3496065 100644 --- a/cloud-config +++ b/cloud-config @@ -36,7 +36,7 @@ runcmd: # --checkout "{instance-config-mgt-repo-checkout}" # -e "{ansible-extra-vars}" rm -rf /opt/instance-config-mgt - exosphere_sha="5c85c9170fbb8ddee99d4c81811ce3468b0279a8" # morpho-cloud-portal-2024.07.17-78a7e2d93 + exosphere_sha="1d41d03baa5cd683ab95a1c1181df82a26b0eb48" # morpho-cloud-portal-2024.07.17-78a7e2d93 ansible-pull \ --url "https://github.com/MorphoCloud/exosphere.git" \ --checkout "$exosphere_sha" \