Merge branch 'main' into prod

noi-techpark · Dec 3, 2024 · ac1f365 · ac1f365
2 parents a4073f8 + 48132a5
commit ac1f365
Show file tree

Hide file tree

Showing 30 changed files with 527 additions and 456 deletions.
diff --git a/.github/workflows/ci-event-a22.yml b/.github/workflows/ci-event-a22.yml
@@ -68,7 +68,7 @@ jobs:
           X_provenance_version: ${{ github.sha }}
 
           # Data Origin Configuration
-          X_A22_CONNECTOR_URL: https://cau.autobrennero.it/Vega/A22DataIIS/A22DataIIS.svc
+          X_A22_CONNECTOR_URL: https://cau.autobrennero.it/Vega/A22DataBrennerlec/A22DataIIS.svc
           X_A22_CONNECTOR_USR: BT5
           X_A22_CONNECTOR_PWD: ${{ secrets.A22_BT5_PWD }}
 
@@ -140,7 +140,7 @@ jobs:
           X_provenance_version: ${{ github.sha }}
 
           # Data Origin Configuration
-          X_A22_CONNECTOR_URL: https://cau.autobrennero.it/Vega/A22DataIIS/A22DataIIS.svc
+          X_A22_CONNECTOR_URL: https://cau.autobrennero.it/Vega/A22DataBrennerlec/A22DataIIS.svc
           X_A22_CONNECTOR_USR: BN5
           X_A22_CONNECTOR_PWD: ${{ secrets.A22_BN5_PWD }}
 

diff --git a/.github/workflows/ci-parking-offstreet-a22.yml b/.github/workflows/ci-parking-offstreet-a22.yml
@@ -45,7 +45,7 @@ jobs:
           working-directory: ${{ env.WORKING_DIRECTORY }}
         env:
           # Data Collector config
-          X_A22_URL: https://cau.autobrennero.it/Vega/A22DataIIS/A22DataIIS.svc
+          X_A22_URL: https://cau.autobrennero.it/Vega/A22DataBrennerlec/A22DataIIS.svc
           X_A22_USER: BT4
           X_A22_PASSWORD: ${{ secrets.A22_BT4_PWD }}
 
@@ -117,7 +117,7 @@ jobs:
           working-directory: ${{ env.WORKING_DIRECTORY }}
         env:
           # Data Collector config
-          X_A22_URL:  https://cau.autobrennero.it/Vega/A22DataIIS/A22DataIIS.svc
+          X_A22_URL:  https://cau.autobrennero.it/Vega/A22DataBrennerlec/A22DataIIS.svc
           X_A22_USER: BN4
           X_A22_PASSWORD: ${{ secrets.A22_BN4_PWD }}
 

diff --git a/.github/workflows/ci-parking-onstreet-bz.yml b/.github/workflows/ci-parking-onstreet-bz.yml
@@ -29,158 +29,158 @@ jobs:
           test-command: 'mvn -B -U clean compile test'
 
 # Deploy Test
-  deploy-test-parking-onstreet-bz:
-    runs-on: ubuntu-20.04
-    if: github.ref == 'refs/heads/main'
-    needs: test
-    concurrency: deploy-test-parking-onstreet-bz
-    env:
-      KEYCLOAK_URL: https://auth.opendatahub.testingmachine.eu
-    steps:
-      - name: Checkout source code
-        uses: noi-techpark/github-actions/checkout@v2
-      - name: Create .env file
-        uses: noi-techpark/github-actions/env-file@v2
-        with:
-          working-directory: ${{ env.WORKING_DIRECTORY }}
-        env:
-          X_SERVER_PORT: 1001
-
-          # 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_authorizationUri: ${{ env.KEYCLOAK_URL }}/auth
-          X_tokenUri: ${{ env.KEYCLOAK_URL }}/auth/realms/noi/protocol/openid-connect/token
-          X_clientId: odh-mobility-datacollector
-          X_clientName: odh-mobility-datacollector
-          X_clientSecret: ${{ secrets.DATACOLLECTORS_CLIENT_SECRET_TEST }}
-          X_scope: openid
-          X_BASE_URI: https://mobility.share.opendatahub.testingmachine.eu/json
-
-          # Logging
-          X_LOG_LEVEL: info
-          X_LOG_STYLE: json
-          X_provenance_name: ${{ env.PROJECT_NAME }}
-          X_provenance_version: ${{ github.sha }}
-
-          # Scheduler: every 5 minutes and every hour
-          X_SCHEDULER_CRON_STATIONS: 0 0 * * * *
-          X_SCHEDULER_CRON_TYPES: 0 0 * * * *
-          X_SCHEDULER_POOL_SIZE: 10
-
-      - name: Retrieve secret files and decode it to a file
-        env:
-          STORED_CREDENTIALS_BASE64: ${{ secrets.PARKING_ONSTREET_BZ_STORED_CREDENTIAL_B64 }}
-          GOOGLE_SECRET_BASE64: ${{ secrets.PARKING_ONSTREET_BZ_GOOGLE_SECRET_B64 }}
-        run: |
-          echo $STORED_CREDENTIALS_BASE64 | base64 --decode > $WORKING_DIRECTORY/src/main/resources/META-INF/credentials/StoredCredential
-          echo $GOOGLE_SECRET_BASE64 | base64 --decode > $WORKING_DIRECTORY/src/main/resources/META-INF/credentials/client_secret.json
-
-      - 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: 'test'
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-          docker-username: 'noi-techpark-bot'
-          docker-password: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
-          project-name: ${{ env.PROJECT_NAME }}
-
-
-  # Deploy Production
-  deploy-prod-parking-onstreet-bz:
-    runs-on: ubuntu-20.04
-    if: github.ref == 'refs/heads/prod'
-    needs: test
-    concurrency: deploy-prod-parking-onstreet-bz
-    env:
-      KEYCLOAK_URL: https://auth.opendatahub.com
-    steps:
-      - name: Checkout source code
-        uses: noi-techpark/github-actions/checkout@v2
-      - name: Create .env file
-        uses: noi-techpark/github-actions/env-file@v2
-        with:
-          working-directory: ${{ env.WORKING_DIRECTORY }}
-        env:
-          X_SERVER_PORT: 1001
-
-          # 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_authorizationUri: ${{ env.KEYCLOAK_URL }}/auth
-          X_tokenUri: ${{ env.KEYCLOAK_URL }}/auth/realms/noi/protocol/openid-connect/token
-          X_clientId: odh-mobility-datacollector
-          X_clientName: odh-mobility-datacollector
-          X_clientSecret: ${{ secrets.DATACOLLECTORS_CLIENT_SECRET_PROD }}
-          X_scope: openid
-          X_BASE_URI: https://mobility.share.opendatahub.com/json
-
-          # Logging
-          X_LOG_LEVEL: "info"
-          X_LOG_STYLE: json
-          X_provenance_name: ${{ env.PROJECT_NAME }}
-          X_provenance_version: ${{ github.sha }}
-
-          # Scheduler: every 5 minutes and every hour
-          X_SCHEDULER_CRON_STATIONS: 0 0 * * * *
-          X_SCHEDULER_CRON_TYPES: 0 0 * * * *
-          X_SCHEDULER_POOL_SIZE: 10
-
-      - name: Retrieve secret files and decode it to a file
-        env:
-          STORED_CREDENTIALS_BASE64: ${{ secrets.PARKING_ONSTREET_BZ_STORED_CREDENTIAL_B64 }}
-          GOOGLE_SECRET_BASE64: ${{ secrets.PARKING_ONSTREET_BZ_GOOGLE_SECRET_B64 }}
-        run: |
-          echo $STORED_CREDENTIALS_BASE64 | base64 --decode > $WORKING_DIRECTORY/credentials/StoredCredential
-          echo $GOOGLE_SECRET_BASE64 | base64 --decode > $WORKING_DIRECTORY/credentials/client_secret.json
-
-      - 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 }}
+  # deploy-test-parking-onstreet-bz:
+  #   runs-on: ubuntu-20.04
+  #   if: github.ref == 'refs/heads/main'
+  #   needs: test
+  #   concurrency: deploy-test-parking-onstreet-bz
+  #   env:
+  #     KEYCLOAK_URL: https://auth.opendatahub.testingmachine.eu
+  #   steps:
+  #     - name: Checkout source code
+  #       uses: noi-techpark/github-actions/checkout@v2
+  #     - name: Create .env file
+  #       uses: noi-techpark/github-actions/env-file@v2
+  #       with:
+  #         working-directory: ${{ env.WORKING_DIRECTORY }}
+  #       env:
+  #         X_SERVER_PORT: 1001
+
+  #         # 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_authorizationUri: ${{ env.KEYCLOAK_URL }}/auth
+  #         X_tokenUri: ${{ env.KEYCLOAK_URL }}/auth/realms/noi/protocol/openid-connect/token
+  #         X_clientId: odh-mobility-datacollector
+  #         X_clientName: odh-mobility-datacollector
+  #         X_clientSecret: ${{ secrets.DATACOLLECTORS_CLIENT_SECRET_TEST }}
+  #         X_scope: openid
+  #         X_BASE_URI: https://mobility.share.opendatahub.testingmachine.eu/json
+
+  #         # Logging
+  #         X_LOG_LEVEL: info
+  #         X_LOG_STYLE: json
+  #         X_provenance_name: ${{ env.PROJECT_NAME }}
+  #         X_provenance_version: ${{ github.sha }}
+
+  #         # Scheduler: every 5 minutes and every hour
+  #         X_SCHEDULER_CRON_STATIONS: 0 0 * * * *
+  #         X_SCHEDULER_CRON_TYPES: 0 0 * * * *
+  #         X_SCHEDULER_POOL_SIZE: 10
+
+  #     - name: Retrieve secret files and decode it to a file
+  #       env:
+  #         STORED_CREDENTIALS_BASE64: ${{ secrets.PARKING_ONSTREET_BZ_STORED_CREDENTIAL_B64 }}
+  #         GOOGLE_SECRET_BASE64: ${{ secrets.PARKING_ONSTREET_BZ_GOOGLE_SECRET_B64 }}
+  #       run: |
+  #         echo $STORED_CREDENTIALS_BASE64 | base64 --decode > $WORKING_DIRECTORY/src/main/resources/META-INF/credentials/StoredCredential
+  #         echo $GOOGLE_SECRET_BASE64 | base64 --decode > $WORKING_DIRECTORY/src/main/resources/META-INF/credentials/client_secret.json
+
+  #     - 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: 'test'
+  #         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+  #         docker-username: 'noi-techpark-bot'
+  #         docker-password: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+  #         project-name: ${{ env.PROJECT_NAME }}
+
+
+  # # Deploy Production
+  # deploy-prod-parking-onstreet-bz:
+  #   runs-on: ubuntu-20.04
+  #   if: github.ref == 'refs/heads/prod'
+  #   needs: test
+  #   concurrency: deploy-prod-parking-onstreet-bz
+  #   env:
+  #     KEYCLOAK_URL: https://auth.opendatahub.com
+  #   steps:
+  #     - name: Checkout source code
+  #       uses: noi-techpark/github-actions/checkout@v2
+  #     - name: Create .env file
+  #       uses: noi-techpark/github-actions/env-file@v2
+  #       with:
+  #         working-directory: ${{ env.WORKING_DIRECTORY }}
+  #       env:
+  #         X_SERVER_PORT: 1001
+
+  #         # 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_authorizationUri: ${{ env.KEYCLOAK_URL }}/auth
+  #         X_tokenUri: ${{ env.KEYCLOAK_URL }}/auth/realms/noi/protocol/openid-connect/token
+  #         X_clientId: odh-mobility-datacollector
+  #         X_clientName: odh-mobility-datacollector
+  #         X_clientSecret: ${{ secrets.DATACOLLECTORS_CLIENT_SECRET_PROD }}
+  #         X_scope: openid
+  #         X_BASE_URI: https://mobility.share.opendatahub.com/json
+
+  #         # Logging
+  #         X_LOG_LEVEL: "info"
+  #         X_LOG_STYLE: json
+  #         X_provenance_name: ${{ env.PROJECT_NAME }}
+  #         X_provenance_version: ${{ github.sha }}
+
+  #         # Scheduler: every 5 minutes and every hour
+  #         X_SCHEDULER_CRON_STATIONS: 0 0 * * * *
+  #         X_SCHEDULER_CRON_TYPES: 0 0 * * * *
+  #         X_SCHEDULER_POOL_SIZE: 10
+
+  #     - name: Retrieve secret files and decode it to a file
+  #       env:
+  #         STORED_CREDENTIALS_BASE64: ${{ secrets.PARKING_ONSTREET_BZ_STORED_CREDENTIAL_B64 }}
+  #         GOOGLE_SECRET_BASE64: ${{ secrets.PARKING_ONSTREET_BZ_GOOGLE_SECRET_B64 }}
+  #       run: |
+  #         echo $STORED_CREDENTIALS_BASE64 | base64 --decode > $WORKING_DIRECTORY/credentials/StoredCredential
+  #         echo $GOOGLE_SECRET_BASE64 | base64 --decode > $WORKING_DIRECTORY/credentials/client_secret.json
+
+  #     - 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/.github/workflows/ci-roadweather-a22.yml b/.github/workflows/ci-roadweather-a22.yml
@@ -59,7 +59,7 @@ jobs:
           X_scope: openid
           X_BASE_URI: https://mobility.share.opendatahub.testingmachine.eu/json
 
-          X_A22_URL: https://cau.autobrennero.it/Vega/A22DataIIS/A22DataIIS.svc
+          X_A22_URL: https://cau.autobrennero.it/Vega/A22DataBrennerlec/A22DataIIS.svc
           X_A22_USER: BT3
           X_A22_PASSWORD: ${{ secrets.A22_BT3_PWD }}
 
@@ -130,7 +130,7 @@ jobs:
           X_scope: openid
           X_BASE_URI: https://mobility.share.opendatahub.com/json
 
-          X_A22_URL: https://cau.autobrennero.it/Vega/A22DataIIS/A22DataIIS.svc
+          X_A22_URL: https://cau.autobrennero.it/Vega/A22DataBrennerlec/A22DataIIS.svc
           X_A22_USER: BN3
           X_A22_PASSWORD: ${{ secrets.A22_BN3_PWD }}
 

diff --git a/.github/workflows/ci-traveltimes-a22.yml b/.github/workflows/ci-traveltimes-a22.yml
@@ -62,18 +62,19 @@ jobs:
           X_BASE_URI: https://mobility.share.opendatahub.testingmachine.eu/json
 
           # Logging
-          X_LOG_LEVEL: "info"
+          X_LOG_LEVEL: "debug"
           X_LOG_STYLE: json
           X_provenance_name: ${{ env.PROJECT_NAME }}
           X_provenance_version: ${{ github.sha }}
 
           # Data Origin Configuration
-          X_A22_CONNECTOR_URL: https://cau.autobrennero.it/Vega/A22DataIIS/A22DataIIS.svc
+          X_A22_CONNECTOR_URL: https://cau.autobrennero.it/Vega/A22DataBrennerlec/A22DataIIS.svc
           X_A22_CONNECTOR_USR: BT1
           X_A22_CONNECTOR_PWD: ${{ secrets.A22_BT1_PWD }}
 
           X_SCHEDULER_CRON: 0 */10 * * * *
           X_SCHEDULER_POOL_SIZE: 10
+          X_IGNORE_500: "true"
 
       - name: Build project
         uses: noi-techpark/github-actions/maven-build@v2
@@ -137,7 +138,7 @@ jobs:
           X_provenance_version: ${{ github.sha }}
 
           # Data Origin Configuration
-          X_A22_CONNECTOR_URL: https://cau.autobrennero.it/Vega/A22DataIIS/A22DataIIS.svc
+          X_A22_CONNECTOR_URL: https://cau.autobrennero.it/Vega/A22DataBrennerlec/A22DataIIS.svc
           X_A22_CONNECTOR_USR: BN1
           X_A22_CONNECTOR_PWD: ${{ secrets.A22_BN1_PWD }}