Merge pull request #1001 from OasisLMF/release/1.27.9

Release 1.27.9
OasisLMF · Mar 27, 2024 · baee38b · baee38b
2 parents 440a998 + c883a0e
commit baee38b
Show file tree

Hide file tree

Showing 14 changed files with 484 additions and 389 deletions.
diff --git a/.github/workflows/build-schema.yml b/.github/workflows/build-schema.yml
@@ -5,10 +5,12 @@ on:
     branches:
       - main-platform1
       - stable**
+      - release**
   pull_request:
     branches:
       - main-platform1
       - stable**
+      - release**
   workflow_dispatch:
     inputs:
       ods_branch:

diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -5,10 +5,12 @@ on:
     branches:
       - main-platform1
       - stable**
+      - release**
   pull_request:
     branches:
       - main-platform1
       - stable**
+      - release**
   schedule:
     - cron:  '0 */6 * * *' # Run scan every 6 hours
 

diff --git a/.github/workflows/test-images.yml b/.github/workflows/test-images.yml
@@ -5,10 +5,12 @@ on:
     branches:
       - main-platform1
       - stable**
+      - release**
   pull_request:
     branches:
       - main-platform1
       - stable**
+      - release**
   workflow_dispatch:
     inputs:
       last_release:
@@ -44,8 +46,8 @@ jobs:
       docker_push: true
       ignore_unfixed: true
       cve_severity: ${{ github.event_name != 'workflow_dispatch' && 'CRITICAL,HIGH' ||  inputs.cve_severity }}
-      oasislmf_branch: ${{ github.event_name != 'workflow_dispatch' && 'main' || inputs.oasislmf_branch }}
-      ods_branch: ${{ github.event_name != 'workflow_dispatch' && 'main' || inputs.ods_branch }}
+      oasislmf_branch: ${{ github.event_name != 'workflow_dispatch' && 'stable/1.27.x' || inputs.oasislmf_branch }}
+      ods_branch: ${{ github.event_name != 'workflow_dispatch' && 'stable/3.0.x' || inputs.ods_branch }}
 
   setup:
     runs-on: ubuntu-latest
@@ -86,22 +88,13 @@ jobs:
       - name: Select PiWind branch
         id: piwind
         run: |
-          # Select matching base branch on piwind
-          if [[ "${{ github.event_name }}" = "pull_request" ]]; then
-            BRANCH=${{ github.base_ref }}
-          elif [[ "${{ github.event_name }}" = "push" ]]; then
-            BRANCH=${{ github.ref_name }}
+          if [[ -z "${{ inputs.piwind_branch }}" ]]; then
+            BRANCH='stable/1.27.x'
           else
             BRANCH=${{ inputs.piwind_branch }}
           fi
-
-          #override 'main-platform1' -> 'main'
-          if [[ "$BRANCH" = 'main-platform1' ]]; then
-             BRANCH=main
-          fi
           echo "branch=$BRANCH" >> $GITHUB_OUTPUT
 
-
       - name: Select Pytest Options
         id: pytest
         run: |

diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -5,10 +5,13 @@ on:
     branches:
       - main-platform1
       - stable**
+      - release**
   pull_request:
     branches:
       - main-platform1
       - stable**
+      - release**
+
   workflow_dispatch:
     inputs:
       ods_branch:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,15 @@
 OasisPlatform Changelog
 =======================
 
+`1.27.9`_
+ ---------
+* [#993, #971, #784, #664, #798](https://github.com/OasisLMF/OasisPlatform/pull/994) - Logging fixes for workers 
+* [#798](https://github.com/OasisLMF/OasisPlatform/pull/998) - Lost analyses logs when a task fails from exit code - v1 workers
+* [#1004](https://github.com/OasisLMF/OasisPlatform/pull/1004) - Fixes for task Cancellation Handling 
+* [#984](https://github.com/OasisLMF/OasisPlatform/pull/984) - Release 1.27.8
+* [#988](https://github.com/OasisLMF/OasisPlatform/pull/988) - Fixed CVE issues 1.27.8
+.. _`1.27.9`:  https://github.com/OasisLMF/OasisPlatform/compare/1.27.8...1.27.9
+
 .. _`1.27.8`:  https://github.com/OasisLMF/OasisPlatform/compare/1.27.7...1.27.8
 
 .. _`1.27.7`:  https://github.com/OasisLMF/OasisPlatform/compare/1.27.6...1.27.7

diff --git a/Dockerfile.model_worker b/Dockerfile.model_worker
@@ -53,7 +53,7 @@ COPY ./tests/integration /home/worker/tests/integration
 # Add required directories
 RUN mkdir -p /var/oasis && \
     mkdir -p /home/worker/model && \
-    mkdir -p /var/log/oasis && \
+    mkdir -p /var/log/oasis/tasks && \
     mkdir -p /shared-fs && \
     touch /var/log/oasis/worker.log && \
     chmod 777 /var/log/oasis/worker.log

diff --git a/Dockerfile.model_worker_debian b/Dockerfile.model_worker_debian
@@ -40,7 +40,7 @@ COPY ./VERSION ./
 
 RUN mkdir -p /var/oasis && \
     mkdir -p /home/worker/model && \
-    mkdir -p /var/log/oasis && \
+    mkdir -p /var/log/oasis/tasks && \
     mkdir -p /shared-fs && \
     touch /var/log/oasis/worker.log && \
     chmod 777 /var/log/oasis/worker.log

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.27.8
+1.27.9
diff --git a/requirements-worker.txt b/requirements-worker.txt
@@ -142,7 +142,7 @@ numpy==1.23.5
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.27.8
+oasislmf[extra]==1.27.9
     # via -r requirements-worker.in
 ods-tools==3.0.8
     # via oasislmf

diff --git a/requirements.txt b/requirements.txt
@@ -287,7 +287,7 @@ numpy==1.23.5
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.27.8
+oasislmf[extra]==1.27.9
     # via -r ./requirements-worker.in
 ods-tools==3.0.8
     # via