meteorology-bz-forecast: increase cron to once per hour and disable p…

…rod deploy
noi-techpark · Nov 16, 2023 · 6a2b8dc · 6a2b8dc
1 parent db7e316
commit 6a2b8dc
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 75 deletions.
diff --git a/.github/workflows/ci-meteorology-bz-forecast.yml b/.github/workflows/ci-meteorology-bz-forecast.yml
@@ -81,7 +81,7 @@ jobs:
           X_LOG_STYLE: json
 
           # Task scheduler
-          X_SCHEDULER_CRON: "0 0 */12 * * *"
+          X_SCHEDULER_CRON: "0 0 */1 * * *"
           X_SCHEDULER_POOL_SIZE: 1
 
       - name: Build project
@@ -109,78 +109,78 @@ jobs:
           project-name: ${{ env.PROJECT_NAME }}
 
   # Deploy Production
-  deploy-prod-meteorology-bz-forecast:
-    runs-on: ubuntu-22.04
-    if: github.ref == 'refs/heads/prod'
-    environment: prod
-    needs: test
-    concurrency: deploy-prod-meteorology-bz-forecast
-    env:
-      KEYCLOAK_URL: https://auth.opendatahub.com
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Create .env file
-        uses: noi-techpark/github-actions/env-file@v2
-        with:
-          working-directory: ${{ env.WORKING_DIRECTORY }}
-        env:
-          # AWS config
-          X_AWS_REGION: eu-west-1
-          X_AWS_S3_FILE_NAME: SMOS_MCPL-WX_EXP_SIAG.JSON
-          X_AWS_S3_BUCKET_NAME: ${{ secrets.METEOROLOGY_BZ_FORECAST_AWS_BUCKET_NAME_PROD }}
-          X_AWS_ACCESS_KEY_ID: ${{ secrets.METEOROLOGY_BZ_FORECAST_AWS_ACCESS_KEY_ID_PROD }}
-          X_AWS_S3_ACCESS_SECRET_KEY: ${{ secrets.METEOROLOGY_BZ_FORECAST_AWS_S3_ACCESS_SECRET_KEY_PROD }}
+  # deploy-prod-meteorology-bz-forecast:
+  #   runs-on: ubuntu-22.04
+  #   if: github.ref == 'refs/heads/prod'
+  #   environment: prod
+  #   needs: test
+  #   concurrency: deploy-prod-meteorology-bz-forecast
+  #   env:
+  #     KEYCLOAK_URL: https://auth.opendatahub.com
+  #   steps:
+  #     - name: Checkout source code
+  #       uses: actions/checkout@v2
+  #     - name: Create .env file
+  #       uses: noi-techpark/github-actions/env-file@v2
+  #       with:
+  #         working-directory: ${{ env.WORKING_DIRECTORY }}
+  #       env:
+  #         # AWS config
+  #         X_AWS_REGION: eu-west-1
+  #         X_AWS_S3_FILE_NAME: SMOS_MCPL-WX_EXP_SIAG.JSON
+  #         X_AWS_S3_BUCKET_NAME: ${{ secrets.METEOROLOGY_BZ_FORECAST_AWS_BUCKET_NAME_PROD }}
+  #         X_AWS_ACCESS_KEY_ID: ${{ secrets.METEOROLOGY_BZ_FORECAST_AWS_ACCESS_KEY_ID_PROD }}
+  #         X_AWS_S3_ACCESS_SECRET_KEY: ${{ secrets.METEOROLOGY_BZ_FORECAST_AWS_S3_ACCESS_SECRET_KEY_PROD }}
 
-          # General deployment options
-          X_COMPOSE_PROJECT_NAME: ${{ env.PROJECT_NAME }}
-          X_DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}
-          X_DOCKER_TAG: ${{ env.DOCKER_TAG }}
-          X_JAVA_OPTIONS: -Xms128m -Xmx512m
-
-          # Open Data Hub Writer Connectivity
-          X_OAUTH_AUTH_URI: ${{ env.KEYCLOAK_URL }}/auth
-          X_OAUTH_TOKEN_URI: ${{ env.KEYCLOAK_URL }}/auth/realms/noi/protocol/openid-connect/token
-          X_OAUTH_CLIENT_ID: odh-mobility-datacollector
-          X_OAUTH_CLIENT_NAME: odh-mobility-datacollector
-          X_OAUTH_CLIENT_SECRET: ${{ secrets.DATACOLLECTORS_CLIENT_SECRET_PROD }}
-          X_OAUTH_BASE_URI: https://mobility.share.opendatahub.com/json
-
-          # Data writer settings
-          X_ODH_CLIENT_PROVENANCE_NAME: ${{ env.PROJECT_NAME }}
-          X_ODH_CLIENT_PROVENANCE_VERSION: ${{ github.sha }}
-          X_ODH_CLIENT_PROVENANCE_ORIGIN: ${{ env.ODH_ORIGIN }}
-          X_ODH_CLIENT_STATION_TYPE_MODEL: ${{ env.ODH_CLIENT_STATION_TYPE_MODEL}}
-          X_ODH_CLIENT_STATION_TYPE_DATA: ${{ env.ODH_CLIENT_STATION_TYPE_DATA}}
-
-          # Logging
-          X_LOG_LEVEL: info
-          X_LOG_STYLE: json
-
-          # Task scheduler
-          X_SCHEDULER_CRON: "0 0 */12 * * *"
-          X_SCHEDULER_POOL_SIZE: 1
-
-      - name: Build project
-        uses: noi-techpark/github-actions/maven-build@v2
-        with:
-          working-directory: ${{ env.WORKING_DIRECTORY }}
-          java-version: ${{ env.JAVA_VERSION }}
-          build-command: "mvn -B -DskipTests -DfinalName=ROOT clean package"
-
-      - name: Build and push images
-        uses: noi-techpark/github-actions/docker-build-and-push@v2
-        with:
-          working-directory: ${{ env.WORKING_DIRECTORY }}/infrastructure
-          docker-username: ${{ github.actor }}
-          docker-password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Deploy application
-        uses: noi-techpark/github-actions/docker-deploy@v2
-        with:
-          working-directory: ${{ env.WORKING_DIRECTORY }}/infrastructure/ansible
-          hosts: "prod"
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-          docker-username: "noi-techpark-bot"
-          docker-password: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
-          project-name: ${{ env.PROJECT_NAME }}
+  #         # General deployment options
+  #         X_COMPOSE_PROJECT_NAME: ${{ env.PROJECT_NAME }}
+  #         X_DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}
+  #         X_DOCKER_TAG: ${{ env.DOCKER_TAG }}
+  #         X_JAVA_OPTIONS: -Xms128m -Xmx512m
+
+  #         # Open Data Hub Writer Connectivity
+  #         X_OAUTH_AUTH_URI: ${{ env.KEYCLOAK_URL }}/auth
+  #         X_OAUTH_TOKEN_URI: ${{ env.KEYCLOAK_URL }}/auth/realms/noi/protocol/openid-connect/token
+  #         X_OAUTH_CLIENT_ID: odh-mobility-datacollector
+  #         X_OAUTH_CLIENT_NAME: odh-mobility-datacollector
+  #         X_OAUTH_CLIENT_SECRET: ${{ secrets.DATACOLLECTORS_CLIENT_SECRET_PROD }}
+  #         X_OAUTH_BASE_URI: https://mobility.share.opendatahub.com/json
+
+  #         # Data writer settings
+  #         X_ODH_CLIENT_PROVENANCE_NAME: ${{ env.PROJECT_NAME }}
+  #         X_ODH_CLIENT_PROVENANCE_VERSION: ${{ github.sha }}
+  #         X_ODH_CLIENT_PROVENANCE_ORIGIN: ${{ env.ODH_ORIGIN }}
+  #         X_ODH_CLIENT_STATION_TYPE_MODEL: ${{ env.ODH_CLIENT_STATION_TYPE_MODEL}}
+  #         X_ODH_CLIENT_STATION_TYPE_DATA: ${{ env.ODH_CLIENT_STATION_TYPE_DATA}}
+
+  #         # Logging
+  #         X_LOG_LEVEL: info
+  #         X_LOG_STYLE: json
+
+  #         # Task scheduler
+  #         X_SCHEDULER_CRON: "0 0 */1 * * *"
+  #         X_SCHEDULER_POOL_SIZE: 1
+
+  #     - name: Build project
+  #       uses: noi-techpark/github-actions/maven-build@v2
+  #       with:
+  #         working-directory: ${{ env.WORKING_DIRECTORY }}
+  #         java-version: ${{ env.JAVA_VERSION }}
+  #         build-command: "mvn -B -DskipTests -DfinalName=ROOT clean package"
+
+  #     - name: Build and push images
+  #       uses: noi-techpark/github-actions/docker-build-and-push@v2
+  #       with:
+  #         working-directory: ${{ env.WORKING_DIRECTORY }}/infrastructure
+  #         docker-username: ${{ github.actor }}
+  #         docker-password: ${{ secrets.GITHUB_TOKEN }}
+
+  #     - name: Deploy application
+  #       uses: noi-techpark/github-actions/docker-deploy@v2
+  #       with:
+  #         working-directory: ${{ env.WORKING_DIRECTORY }}/infrastructure/ansible
+  #         hosts: "prod"
+  #         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+  #         docker-username: "noi-techpark-bot"
+  #         docker-password: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+  #         project-name: ${{ env.PROJECT_NAME }}
diff --git a/.../opendatahub/bdp/commons/dc/meteorology/bz/forecast/services/MunicipalityLocationMap.java b/.../opendatahub/bdp/commons/dc/meteorology/bz/forecast/services/MunicipalityLocationMap.java
@@ -15,6 +15,7 @@
 import com.opendatahub.bdp.commons.dc.meteorology.bz.forecast.dto.MunicipalityDto;
 
 // taken from https://tourism.opendatahub.com/v1/Municipality?fields=Detail.de.Title,Latitude,Longitude
+// some names have been changed to fit the names from the forecast data
 @Service
 public class MunicipalityLocationMap extends HashMap<String, LocationDto> {