appa-tn-tenminutes: reenable deploy, since data collector is failing …

…and deploy has been disabled for 1+ years
noi-techpark · Nov 7, 2023 · 83c6614 · 83c6614
1 parent b3af492
commit 83c6614
Showing 1 changed file with 136 additions and 136 deletions.
diff --git a/.github/workflows/ci-environment-appa-tn-tenminutes.yml b/.github/workflows/ci-environment-appa-tn-tenminutes.yml
@@ -31,140 +31,140 @@ jobs:
 # Source API currently in stand-by, so deploy is disabled
 
 # Deploy Test
-  # deploy-test-environment-appa-tn-tenminutes:
-  #   runs-on: ubuntu-20.04
-  #   if: github.ref == 'refs/heads/main'
-  #   needs: test
-  #   concurrency: deploy-test-environment-appa-tn-tenminutes
-  #   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:
-  #         # Data Collector config
-  #         X_odp_url_stations_tenminutes: ${{ secrets.APPA_TN_TENMINUTES_DATA_ENDPOINT}}
-  #         X_odp_url_stations_tenminutes_key: ${{ secrets.APPA_TN_TENMINUTES_AUTH_TOKEN}}
-
-  #         # 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
-  #         X_SCHEDULER_CRON_DATA: 0 0 * * * ?
-  #         X_SCHEDULER_POOL_SIZE: 10
-
-  #     - 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-environment-appa-tn-tenminutes:
-  #   runs-on: ubuntu-20.04
-  #   if: github.ref == 'refs/heads/prod'
-  #   needs: test
-  #   concurrency: deploy-prod-environment-appa-tn-tenminutes
-  #   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:
-  #         # Data Collector config
-  #         X_odp_url_stations_tenminutes: ${{ secrets.APPA_TN_TENMINUTES_DATA_ENDPOINT}}
-  #         X_odp_url_stations_tenminutes_key: ${{ secrets.APPA_TN_TENMINUTES_AUTH_TOKEN}}
-
-  #         # 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
-  #         X_SCHEDULER_CRON_DATA: 0 0 * * * ?
-  #         X_SCHEDULER_POOL_SIZE: 10
-
-  #     - 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-environment-appa-tn-tenminutes:
+    runs-on: ubuntu-20.04
+    if: github.ref == 'refs/heads/main'
+    needs: test
+    concurrency: deploy-test-environment-appa-tn-tenminutes
+    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:
+          # Data Collector config
+          X_odp_url_stations_tenminutes: ${{ secrets.APPA_TN_TENMINUTES_DATA_ENDPOINT}}
+          X_odp_url_stations_tenminutes_key: ${{ secrets.APPA_TN_TENMINUTES_AUTH_TOKEN}}
+
+          # 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
+          X_SCHEDULER_CRON_DATA: 0 0 * * * ?
+          X_SCHEDULER_POOL_SIZE: 10
+
+      - 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-environment-appa-tn-tenminutes:
+    runs-on: ubuntu-20.04
+    if: github.ref == 'refs/heads/prod'
+    needs: test
+    concurrency: deploy-prod-environment-appa-tn-tenminutes
+    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:
+          # Data Collector config
+          X_odp_url_stations_tenminutes: ${{ secrets.APPA_TN_TENMINUTES_DATA_ENDPOINT}}
+          X_odp_url_stations_tenminutes_key: ${{ secrets.APPA_TN_TENMINUTES_AUTH_TOKEN}}
+
+          # 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
+          X_SCHEDULER_CRON_DATA: 0 0 * * * ?
+          X_SCHEDULER_POOL_SIZE: 10
+
+      - 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 }}