Skip to content

Commit

Permalink
Update ci_module.yml (#190)
Browse files Browse the repository at this point in the history
* Update ci_module.yml

* Update ci_assembly.yml

* Update ci_assembly.yml

* Update ci_module.yml
  • Loading branch information
delcroip committed Nov 23, 2023
1 parent 5378f52 commit 0e315cb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci_assembly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
ci_assembly:
runs-on: ubuntu-20.04
runs-on: [self-hosted, linux, x64]

services:
mssql:
Expand All @@ -20,7 +20,7 @@ jobs:
ACCEPT_EULA: Y
SA_PASSWORD: GitHub999
ports:
- 1433:1433
- 2433:1433
# this health-cmd needed because the mssql container does not provide a health check
options: >-
--health-interval=10s
Expand All @@ -38,7 +38,7 @@ jobs:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: GitHub999
ports:
- 5432:5432
- 6432:5432
options: >-
--health-cmd pg_isready
--health-interval 10s
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
env:
DB_HOST: localhost
DB_PORT: 5432
DB_PORT: 6432
DB_NAME: imis
DB_USER: postgres
DB_PASSWORD: GitHub999
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
/opt/mssql-tools/bin/sqlcmd -S $DB_HOST -U $DB_USER -P $DB_PASSWORD -d $DB_NAME_TEST -i ./sql_mssql/output/fullDemoDatabase.sql | grep . | uniq -c
env:
DB_HOST: localhost
DB_PORT: 1433
DB_PORT: 2433
DB_NAME: imis
DB_USER: sa
DB_PASSWORD: GitHub999
Expand All @@ -147,7 +147,7 @@ jobs:
DB_ENGINE: django.db.backends.postgresql
#DJANGO_SETTINGS_MODULE: hat.settings
DB_HOST: localhost
DB_PORT: 5432
DB_PORT: 6432
DB_NAME: imis
DB_USER: postgres
DB_PASSWORD: GitHub999
Expand All @@ -169,7 +169,7 @@ jobs:
DB_ENGINE: mssql
#DJANGO_SETTINGS_MODULE: hat.settings
DB_HOST: localhost
DB_PORT: 1433
DB_PORT: 2433
DB_NAME: imis
DB_USER: sa
DB_PASSWORD: GitHub999
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci_module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:
jobs:
build_backend:
name: Build Backend
runs-on: ubuntu-20.04
runs-on: [self-hosted, linux, x64]
steps:
- name: Set up Python 3.8
uses: actions/setup-python@v2
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
ACCEPT_EULA: Y
SA_PASSWORD: GitHub999
ports:
- 1433:1433
- 2433:1433
# this health-cmd needed because the mssql container does not provide a health check
options: >-
--health-interval=10s
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
/opt/mssql-tools/bin/sqlcmd -S $DB_HOST -U $DB_USER -P $DB_PASSWORD -d $DB_NAME_TEST -i ./sql_mssql/output/fullDemoDatabase.sql | grep . | uniq -c
env:
DB_HOST: localhost
DB_PORT: 1433
DB_PORT: 2433
DB_NAME: imis
DB_USER: sa
DB_PASSWORD: GitHub999
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
DB_ENGINE: mssql
#DJANGO_SETTINGS_MODULE: hat.settings
DB_HOST: localhost
DB_PORT: 1433
DB_PORT: 2433
DB_NAME: imis
DB_USER: sa
DB_PASSWORD: GitHub999
Expand All @@ -222,14 +222,14 @@ jobs:
#REMOTE_USER_AUTHENTICATION: False
ci_module_psql_test:
name: Run All Tests (PSQL)
runs-on: ubuntu-20.04
runs-on: [self-hosted, linux, x64]
needs: build_backend
services:
pgsql:
image: postgres
env:
DB_HOST: localhost
DB_PORT: 5432
DB_PORT: 6432
POSTGRES_DB: imis
POSTGRES_USER: postgres
POSTGRES_PASSWORD: GitHub999
Expand Down Expand Up @@ -288,7 +288,7 @@ jobs:
env:
DB_HOST: localhost
DB_PORT: 5432
DB_PORT: 6432
DB_NAME: imis
DB_USER: postgres
DB_PASSWORD: GitHub999
Expand All @@ -314,7 +314,7 @@ jobs:
DB_ENGINE: django.db.backends.postgresql
#DJANGO_SETTINGS_MODULE: hat.settings
DB_HOST: localhost
DB_PORT: 5432
DB_PORT: 6432
DB_NAME: imis
DB_USER: postgres
DB_PASSWORD: GitHub999
Expand All @@ -341,7 +341,7 @@ jobs:
path: ./openimis/openIMIS/coverage
flake-8-linter:
name: Run flake8 check
runs-on: ubuntu-20.04
runs-on: [self-hosted, linux, x64]
needs: build_backend
steps:
- name: Set up Python 3.8
Expand Down Expand Up @@ -389,7 +389,7 @@ jobs:
path: ./openimis/flake8-report.txt
sonar_scan:
name: Run Sonar Scan
runs-on: ubuntu-20.04
runs-on: [self-hosted, linux, x64]
needs: [ci_module_psql_test, flake-8-linter]
if: always()
env:
Expand Down

0 comments on commit 0e315cb

Please sign in to comment.