Fix/plat 2 checks stable (#180)

* Add missing pip package to server image (#179) * Update Plat2 controller queue var * Add version var to workflow
OasisLMF · Feb 28, 2024 · ad72597 · ad72597
1 parent df17057
commit ad72597
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -63,6 +63,11 @@ on:
         required: false
         type: string
 
+      worker_api_ver:
+        description: 'Worker image run mode [v1, v2]'
+        required: false
+        type: string
+
 env:
   oasislmf_branch: 'main'
   oasislmf_package: ''
@@ -137,3 +142,4 @@ jobs:
       debug_mode: 1
       pytest_opts: ${{ inputs.pytest_opts }}
       storage_suffix: ${{ inputs.storage_suffix }}
+      worker_api_ver: ${{ inputs.worker_api_ver }}
diff --git a/docker/Dockerfile.piwind_server b/docker/Dockerfile.piwind_server
@@ -1,7 +1,7 @@
 FROM coreoasis/api_server:latest
 
 USER root 
-RUN apt-get update && apt-get -y install git && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get -y install git python3-pip && rm -rf /var/lib/apt/lists/*
 
 COPY --chown=server:server $ods_package ./
 USER server

diff --git a/docker/plat2-v2.docker-compose.yml b/docker/plat2-v2.docker-compose.yml
@@ -21,8 +21,9 @@ x-server-env: &server-env
   OASIS_CELERY_DB_USER: celery
   OASIS_CELERY_DB_NAME: celery
   OASIS_CELERY_DB_PORT: 5432
-  OASIS_INPUT_GENERATION_CONTROLLER_QUEUE: task-controller
-  OASIS_LOSSES_GENERATION_CONTROLLER_QUEUE: task-controller
+  OASIS_INPUT_GENERATION_CONTROLLER_QUEUE: task-controller  # older setting (before 2.3.1)
+  OASIS_LOSSES_GENERATION_CONTROLLER_QUEUE: task-controller # older setting (before 2.3.1)
+  OASIS_TASK_CONTROLLER_QUEUE: task-controller              # New option v2.3.1+ 
 
 x-worker-env: &worker-env
   OASIS_DEBUG: 1

diff --git a/docker/plat2.docker-compose.yml b/docker/plat2.docker-compose.yml
@@ -20,8 +20,9 @@ x-shared-env: &shared-env
   OASIS_CELERY_DB_USER: celery
   OASIS_CELERY_DB_NAME: celery
   OASIS_CELERY_DB_PORT: 5432
-  OASIS_INPUT_GENERATION_CONTROLLER_QUEUE: task-controller
-  OASIS_LOSSES_GENERATION_CONTROLLER_QUEUE: task-controller
+  OASIS_INPUT_GENERATION_CONTROLLER_QUEUE: task-controller  # older setting (before 2.3.1)
+  OASIS_LOSSES_GENERATION_CONTROLLER_QUEUE: task-controller # older setting (before 2.3.1)
+  OASIS_TASK_CONTROLLER_QUEUE: task-controller              # New option v2.3.1+ 
 x-volumes: &shared-volumes
   - filestore-OasisData:/shared-fs:rw
 services: