Skip to content

Commit

Permalink
Merge branch 'main' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
clezag committed Nov 29, 2023
2 parents 83c6614 + a04119a commit 9b23f17
Show file tree
Hide file tree
Showing 139 changed files with 3,113 additions and 1,594 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci-bike-chargers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ env:
PROJECT_NAME: odh-mobility-dc-bike-chargers
DOCKER_IMAGE: ghcr.io/${{ github.repository }}/odh-mobility-dc-bike-chargers
DOCKER_TAG: ${{ github.sha }}
JAVA_VERSION: '8'
JAVA_VERSION: '17'

jobs:

# Test
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout source code
uses: noi-techpark/github-actions/checkout@v2
Expand All @@ -32,7 +32,7 @@ jobs:

# Deploy Test
deploy-test-bike-chargers:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/main'
needs: test
concurrency: deploy-test-bike-chargers
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:

# Deploy Production
deploy-prod-bike-chargers:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/prod'
needs: test
concurrency: deploy-prod-bike-chargers
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-carsharing-halapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ env:
PROJECT_NAME: odh-mobility-dc-carsharing-halapi
DOCKER_IMAGE: ghcr.io/${{ github.repository }}/odh-mobility-dc-carsharing-halapi
DOCKER_TAG: ${{ github.sha }}
JAVA_VERSION: '8'
JAVA_VERSION: '17'

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout source code
uses: noi-techpark/github-actions/checkout@v2
Expand All @@ -30,7 +30,7 @@ jobs:

# Deploy Test
deploy-test-carsharing-halapi:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/main'
needs: test
concurrency: deploy-test-carsharing-halapi
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:

# Deploy Production
deploy-prod-carsharing-halapi:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/prod'
needs: test
concurrency: deploy-prod-carsharing-halapi
Expand Down
186 changes: 186 additions & 0 deletions .github/workflows/ci-meteorology-bz-forecast.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
name: CI/CD meteorology-bz-forecast

on:
push:
paths:
- "data-collectors/meteorology-bz-forecast/**"
- ".github/workflows/ci-meteorology-bz-forecast.yml"

env:
WORKING_DIRECTORY: data-collectors/meteorology-bz-forecast
PROJECT_NAME: odh-mobility-dc-meteorology-bz-forecast
DOCKER_IMAGE: ghcr.io/${{ github.repository }}/odh-mobility-dc-meteorology-bz-forecast
DOCKER_TAG: ${{ github.sha }}
JAVA_VERSION: "17"
ODH_ORIGIN: province-bolzano
ODH_CLIENT_STATION_TYPE_MODEL: WeatherForecastService
ODH_CLIENT_STATION_TYPE_DATA: WeatherForecast

jobs:
test:
runs-on: ubuntu-20.04
steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: REUSE Compliance Check
uses: fsfe/reuse-action@v1
- name: Test code
uses: noi-techpark/github-actions/maven-test@v2
with:
java-version: ${{ env.JAVA_VERSION }}
working-directory: ${{ env.WORKING_DIRECTORY }}
test-command: "mvn -B -U clean compile test"

# Deploy Test
deploy-test-meteorology-bz-forecast:
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/main'
environment: test
needs: test
concurrency: deploy-test-meteorology-bz-forecast
env:
KEYCLOAK_URL: https://auth.opendatahub.testingmachine.eu
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_TEST }}
X_AWS_ACCESS_KEY_ID: ${{ secrets.METEOROLOGY_BZ_FORECAST_AWS_ACCESS_KEY_ID_TEST }}
X_AWS_S3_ACCESS_SECRET_KEY: ${{ secrets.METEOROLOGY_BZ_FORECAST_AWS_S3_ACCESS_SECRET_KEY_TEST }}

# 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_TEST }}
X_OAUTH_BASE_URI: https://mobility.share.opendatahub.testingmachine.eu/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: "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-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 */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 }}
10 changes: 4 additions & 6 deletions .github/workflows/ci-meteorology-tn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ env:
PROJECT_NAME: odh-mobility-dc-meteorology-tn
DOCKER_IMAGE: ghcr.io/${{ github.repository }}/odh-mobility-dc-meteorology-tn
DOCKER_TAG: ${{ github.sha }}
JAVA_VERSION: '8'
JAVA_VERSION: '17'

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout source code
uses: noi-techpark/github-actions/checkout@v2
Expand All @@ -30,7 +30,7 @@ jobs:

# Deploy Test
deploy-test-meteorology-tn:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/main'
needs: test
concurrency: deploy-test-meteorology-tn
Expand Down Expand Up @@ -67,7 +67,6 @@ jobs:

# Scheduler
X_SCHEDULER_CRON_DATA: 0 01/15 * * * *
X_SCHEDULER_CRON_TYPES: 0 0 * * * *
X_SCHEDULER_CRON_STATIONS: 0 0 1 * * *
X_SCHEDULER_POOL_SIZE: 10

Expand Down Expand Up @@ -99,7 +98,7 @@ jobs:

# Deploy Production
deploy-prod-meteorology-tn:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/prod'
needs: test
concurrency: deploy-prod-meteorology-tn
Expand Down Expand Up @@ -136,7 +135,6 @@ jobs:

# Scheduler
X_SCHEDULER_CRON_DATA: 0 01/15 * * * *
X_SCHEDULER_CRON_TYPES: 0 0 * * * *
X_SCHEDULER_CRON_STATIONS: 0 0 1 * * *
X_SCHEDULER_POOL_SIZE: 10

Expand Down
Loading

0 comments on commit 9b23f17

Please sign in to comment.