Skip to content

Commit

Permalink
commented out the vachan-api-test container and Run test in workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Ketan Kumar Baboo committed Aug 28, 2024
1 parent d0c8ba0 commit b97f462
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 98 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@

name: run-test
# name: run-test

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on: [push, pull_request ]
# # Controls when the action will run. Triggers the workflow on push or pull request
# # events but only for the master branch
# on: [push, pull_request ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build n lint"
build-n-test:
# The type of runner that the job will run on
runs-on: ubuntu-latest
# # A workflow run is made up of one or more jobs that can run sequentially or in parallel
# jobs:
# # This workflow contains a single job called "build n lint"
# build-n-test:
# # The type of runner that the job will run on
# runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: Start dependancies
working-directory: ./docker
run: docker compose -f docker-compose-staging.yml up -d
- name: Run tests
working-directory: ./docker
run: docker compose -f docker-compose-staging.yml run vachan-api-test
# # Steps represent a sequence of tasks that will be executed as part of the job
# steps:
# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
# - uses: actions/checkout@v2
# - name: Start dependancies
# working-directory: ./docker
# run: docker compose -f docker-compose-staging.yml up -d
# - name: Run tests
# working-directory: ./docker
# run: docker compose -f docker-compose-staging.yml run vachan-api-test
78 changes: 39 additions & 39 deletions docker/docker-compose-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,45 +141,45 @@ services:
networks:
- VE-network

vachan-api-test:
build:
context: ../
dockerfile: ./docker/Dockerfile
healthcheck:
timeout: 45s
interval: 10s
retries: 10
environment:
- VACHAN_POSTGRES_HOST=vachan-db
- VACHAN_POSTGRES_USER=${VACHAN_POSTGRES_USER:-postgres}
- VACHAN_POSTGRES_PASSWORD=${VACHAN_POSTGRES_PASSWORD:-password}
- VACHAN_POSTGRES_DATABASE=${VACHAN_POSTGRES_DATABASE:-vachan_dev}
- VACHAN_POSTGRES_PORT=5432
- VACHAN_KRATOS_PUBLIC_URL=http://kratos:4433/
- VACHAN_KRATOS_ADMIN_URL=http://kratos:4434/
- VACHAN_SUPER_USERNAME=${VACHAN_SUPER_USERNAME:[email protected]}
- VACHAN_GITLAB_TOKEN=${VACHAN_GITLAB_TOKEN}
- VACHAN_SUPER_PASSWORD=${VACHAN_SUPER_PASSWORD:-Just4Complexity!}
- VACHAN_TEST_MODE="False"
- VACHAN_LOGGING_LEVEL=INFO
- VACHAN_DOMAIN=${VACHAN_DOMAIN:-http://localhost:8000}
command: python -m pytest
volumes:
- logs-test-vol:/app/logs
restart: "no"
expose:
- 8000
links:
- vachan-db
- kratos
depends_on:
- kratos-postgresd
- kratos
- vachan-db
profiles:
- testing
networks:
- VE-network
# vachan-api-test:
# build:
# context: ../
# dockerfile: ./docker/Dockerfile
# healthcheck:
# timeout: 45s
# interval: 10s
# retries: 10
# environment:
# - VACHAN_POSTGRES_HOST=vachan-db
# - VACHAN_POSTGRES_USER=${VACHAN_POSTGRES_USER:-postgres}
# - VACHAN_POSTGRES_PASSWORD=${VACHAN_POSTGRES_PASSWORD:-password}
# - VACHAN_POSTGRES_DATABASE=${VACHAN_POSTGRES_DATABASE:-vachan_dev}
# - VACHAN_POSTGRES_PORT=5432
# - VACHAN_KRATOS_PUBLIC_URL=http://kratos:4433/
# - VACHAN_KRATOS_ADMIN_URL=http://kratos:4434/
# - VACHAN_SUPER_USERNAME=${VACHAN_SUPER_USERNAME:[email protected]}
# - VACHAN_GITLAB_TOKEN=${VACHAN_GITLAB_TOKEN}
# - VACHAN_SUPER_PASSWORD=${VACHAN_SUPER_PASSWORD:-Just4Complexity!}
# - VACHAN_TEST_MODE="False"
# - VACHAN_LOGGING_LEVEL=INFO
# - VACHAN_DOMAIN=${VACHAN_DOMAIN:-http://localhost:8000}
# command: python -m pytest
# volumes:
# - logs-test-vol:/app/logs
# restart: "no"
# expose:
# - 8000
# links:
# - vachan-db
# - kratos
# depends_on:
# - kratos-postgresd
# - kratos
# - vachan-db
# profiles:
# - testing
# networks:
# - VE-network

vachan-demos:
image: vachanengine/vachan-demos:v2.0.0-alpha.13
Expand Down
78 changes: 39 additions & 39 deletions docker/docker-compose-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,45 +133,45 @@ services:
networks:
- VE-network

vachan-api-test:
build:
context: ../
dockerfile: ./docker/Dockerfile
healthcheck:
timeout: 45s
interval: 10s
retries: 10
environment:
- VACHAN_POSTGRES_HOST=vachan-db
- VACHAN_POSTGRES_USER=${VACHAN_POSTGRES_USER:-postgres}
- VACHAN_POSTGRES_PASSWORD=${VACHAN_POSTGRES_PASSWORD:-password}
- VACHAN_POSTGRES_DATABASE=${VACHAN_POSTGRES_DATABASE:-vachan_dev}
- VACHAN_POSTGRES_PORT=5432
- VACHAN_KRATOS_PUBLIC_URL=http://kratos:4433/
- VACHAN_KRATOS_ADMIN_URL=http://kratos:4434/
- VACHAN_SUPER_USERNAME=${VACHAN_SUPER_USERNAME:[email protected]}
- VACHAN_GITLAB_TOKEN=${VACHAN_GITLAB_TOKEN}
- VACHAN_SUPER_PASSWORD=${VACHAN_SUPER_PASSWORD:-Just4Complexity!}
- VACHAN_TEST_MODE="False"
- VACHAN_LOGGING_LEVEL=INFO
- VACHAN_DOMAIN=${VACHAN_DOMAIN:-http://localhost:8000}
command: python -m pytest
volumes:
- logs-test-vol:/app/logs
restart: "no"
expose:
- 8000
links:
- vachan-db
- kratos
depends_on:
- kratos-postgresd
- kratos
- vachan-db
profiles:
- testing
networks:
- VE-network
# vachan-api-test:
# build:
# context: ../
# dockerfile: ./docker/Dockerfile
# healthcheck:
# timeout: 45s
# interval: 10s
# retries: 10
# environment:
# - VACHAN_POSTGRES_HOST=vachan-db
# - VACHAN_POSTGRES_USER=${VACHAN_POSTGRES_USER:-postgres}
# - VACHAN_POSTGRES_PASSWORD=${VACHAN_POSTGRES_PASSWORD:-password}
# - VACHAN_POSTGRES_DATABASE=${VACHAN_POSTGRES_DATABASE:-vachan_dev}
# - VACHAN_POSTGRES_PORT=5432
# - VACHAN_KRATOS_PUBLIC_URL=http://kratos:4433/
# - VACHAN_KRATOS_ADMIN_URL=http://kratos:4434/
# - VACHAN_SUPER_USERNAME=${VACHAN_SUPER_USERNAME:[email protected]}
# - VACHAN_GITLAB_TOKEN=${VACHAN_GITLAB_TOKEN}
# - VACHAN_SUPER_PASSWORD=${VACHAN_SUPER_PASSWORD:-Just4Complexity!}
# - VACHAN_TEST_MODE="False"
# - VACHAN_LOGGING_LEVEL=INFO
# - VACHAN_DOMAIN=${VACHAN_DOMAIN:-http://localhost:8000}
# command: python -m pytest
# volumes:
# - logs-test-vol:/app/logs
# restart: "no"
# expose:
# - 8000
# links:
# - vachan-db
# - kratos
# depends_on:
# - kratos-postgresd
# - kratos
# - vachan-db
# profiles:
# - testing
# networks:
# - VE-network

vachan-demos:
image: vachanengine/vachan-demos:v2.0.0-alpha.13
Expand Down

0 comments on commit b97f462

Please sign in to comment.