Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add stable/2.3.x to compatibility checks and fixed V2 worker monitor issue #1054

Merged
merged 4 commits into from
May 24, 2024
Merged

Add stable/2.3.x to compatibility checks and fixed V2 worker monitor issue #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
757e214
Add last stable 2.3.x image to compatibility checks
sambles May 24, 2024
d56e7c7
Fix failed jobs
sambles May 24, 2024
20794f6
f
sambles May 24, 2024
387ca1a
Add check for raw_output_locations in worker result
sambles May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 44 additions & 24 deletions .github/workflows/test-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,11 @@ jobs:
piwind_branch: ${{ steps.piwind.outputs.branch }}

release_tag: ${{ steps.released_images.outputs.prev_release_tag }}
release_stable_15: ${{ steps.released_images.outputs.stable_15 }}
release_stable_23: ${{ steps.released_images.outputs.stable_23 }}
release_stable_27: ${{ steps.released_images.outputs.stable_27 }}
release_stable_28: ${{ steps.released_images.outputs.stable_28 }}
release_stable_1-15: ${{ steps.released_images.outputs.stable_1-15 }}
release_stable_1-23: ${{ steps.released_images.outputs.stable_1-23 }}
release_stable_1-27: ${{ steps.released_images.outputs.stable_1-27 }}
release_stable_1-28: ${{ steps.released_images.outputs.stable_1-28 }}
release_stable_2-3: ${{ steps.released_images.outputs.stable_2-3 }}

build_server_img: ${{ steps.built_images.outputs.server_img }}
build_server_tag: ${{ steps.built_images.outputs.server_tag }}
Expand Down Expand Up @@ -91,16 +92,19 @@ jobs:

# Find latest LTS from each stable branch
stable_1_15=$( ./scripts/find_latest.sh -j 1 -i 15 )
echo "stable_15=$stable_1_15" >> $GITHUB_OUTPUT
echo "stable_1-15=$stable_1_15" >> $GITHUB_OUTPUT

stable_1_23=$( ./scripts/find_latest.sh -j 1 -i 23 )
echo "stable_23=$stable_1_23" >> $GITHUB_OUTPUT
echo "stable_1-23=$stable_1_23" >> $GITHUB_OUTPUT

stable_1_27=$( ./scripts/find_latest.sh -j 1 -i 27 )
echo "stable_27=$stable_1_27" >> $GITHUB_OUTPUT
echo "stable_1-27=$stable_1_27" >> $GITHUB_OUTPUT

stable_1_28=$( ./scripts/find_latest.sh -j 1 -i 28 )
echo "stable_28=$stable_1_28" >> $GITHUB_OUTPUT
echo "stable_1-28=$stable_1_28" >> $GITHUB_OUTPUT

stable_2_3=$( ./scripts/find_latest.sh -j 2 -i 3 )
echo "stable_2-3=$stable_2_3" >> $GITHUB_OUTPUT

- name: Select PiWind branch
id: piwind
Expand Down Expand Up @@ -229,8 +233,8 @@ jobs:
pytest_opts: "--docker-compose=./docker/plat2-v2.docker-compose.yml ${{ needs.setup.outputs.pytest_opts }}"
storage_suffix: '-worker-debian'

stable_compatibility_15:
name: Test stable worker (${{ needs.setup.outputs.release_stable_15 }})
stable_compatibility_1-15:
name: Test stable worker (${{ needs.setup.outputs.release_stable_1-15 }})
secrets: inherit
needs: [setup]
uses: OasisLMF/OasisPiWind/.github/workflows/integration.yml@main
Expand All @@ -239,14 +243,14 @@ jobs:
server_image: ${{ needs.setup.outputs.build_server_img }}
server_tag: ${{ needs.setup.outputs.build_server_tag }}
worker_image: 'coreoasis/model_worker'
worker_tag: ${{ needs.setup.outputs.release_stable_15 }}
worker_tag: ${{ needs.setup.outputs.release_stable_1-15 }}
worker_api_ver: 'v1'
debug_mode: 1
pytest_opts: "--docker-compose=./docker/plat2-v2.docker-compose.yml ${{ needs.setup.outputs.pytest_opts }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_15 }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_1-15 }}"

stable_compatibility_23:
name: Test stable worker (${{ needs.setup.outputs.release_stable_23 }})
stable_compatibility_1-23:
name: Test stable worker (${{ needs.setup.outputs.release_stable_1-23 }})
secrets: inherit
needs: [setup]
uses: OasisLMF/OasisPiWind/.github/workflows/integration.yml@main
Expand All @@ -255,14 +259,14 @@ jobs:
server_image: ${{ needs.setup.outputs.build_server_img }}
server_tag: ${{ needs.setup.outputs.build_server_tag }}
worker_image: 'coreoasis/model_worker'
worker_tag: ${{ needs.setup.outputs.release_stable_23 }}
worker_tag: ${{ needs.setup.outputs.release_stable_1-23 }}
worker_api_ver: 'v1'
debug_mode: 1
pytest_opts: "--docker-compose=./docker/plat2-v2.docker-compose.yml ${{ needs.setup.outputs.pytest_opts }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_23 }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_1-23 }}"

stable_compatibility_27:
name: Test stable worker (${{ needs.setup.outputs.release_stable_27 }})
stable_compatibility_1-27:
name: Test stable worker (${{ needs.setup.outputs.release_stable_1-27 }})
secrets: inherit
needs: [setup]
uses: OasisLMF/OasisPiWind/.github/workflows/integration.yml@main
Expand All @@ -271,14 +275,14 @@ jobs:
server_image: ${{ needs.setup.outputs.build_server_img }}
server_tag: ${{ needs.setup.outputs.build_server_tag }}
worker_image: 'coreoasis/model_worker'
worker_tag: ${{ needs.setup.outputs.release_stable_27 }}
worker_tag: ${{ needs.setup.outputs.release_stable_1-27 }}
worker_api_ver: 'v1'
debug_mode: 1
pytest_opts: "--docker-compose=./docker/plat2-v2.docker-compose.yml ${{ needs.setup.outputs.pytest_opts }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_27 }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_1-27 }}"

stable_compatibility_28:
name: Test stable worker (${{ needs.setup.outputs.release_stable_28 }})
stable_compatibility_1-28:
name: test stable worker (${{ needs.setup.outputs.release_stable_1-28 }})
secrets: inherit
needs: [setup]
uses: OasisLMF/OasisPiWind/.github/workflows/integration.yml@main
Expand All @@ -287,9 +291,25 @@ jobs:
server_image: ${{ needs.setup.outputs.build_server_img }}
server_tag: ${{ needs.setup.outputs.build_server_tag }}
worker_image: 'coreoasis/model_worker'
worker_tag: ${{ needs.setup.outputs.release_stable_28 }}
worker_tag: ${{ needs.setup.outputs.release_stable_1-28 }}
worker_api_ver: 'v1'
debug_mode: 1
pytest_opts: "--docker-compose=./docker/plat2-v2.docker-compose.yml ${{ needs.setup.outputs.pytest_opts }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_28 }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_1-28 }}"

stable_compatibility_2-3:
name: test stable worker (${{ needs.setup.outputs.release_stable_2-3 }})
secrets: inherit
needs: [setup]
uses: OasisLMF/OasisPiWind/.github/workflows/integration.yml@main
with:
piwind_branch: 'stable/2.3.x'
server_image: ${{ needs.setup.outputs.build_server_img }}
server_tag: ${{ needs.setup.outputs.build_server_tag }}
worker_image: 'coreoasis/model_worker'
worker_tag: ${{ needs.setup.outputs.release_stable_2-3 }}
worker_api_ver: 'v2'
debug_mode: 1
pytest_opts: "--docker-compose=./docker/plat2-v2.docker-compose.yml ${{ needs.setup.outputs.pytest_opts }}"
storage_suffix: "_worker-${{ needs.setup.outputs.release_stable_2-3 }}"

11 changes: 6 additions & 5 deletions src/server/oasisapi/analyses/v2_api/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,11 +553,12 @@ def record_losses_files(self, result, analysis_id=None, initiator_id=None, slug=

# remove then store raw files.
analysis.raw_output_files.all().delete()
for name, put_location in result['raw_output_locations'].items():
content_type = 'application/octet-stream'
if name[-4:] == '.csv':
content_type = 'text/csv'
analysis.raw_output_files.add(store_file(put_location, content_type, initiator, filename=name))
if 'raw_output_locations' in result:
for name, put_location in result['raw_output_locations'].items():
content_type = 'application/octet-stream'
if name[-4:] == '.csv':
content_type = 'text/csv'
analysis.raw_output_files.add(store_file(put_location, content_type, initiator, filename=name))

analysis.save()
return result
Expand Down
Loading