Merge pull request #863 from KetanKBaboo/remove-api-test-container-846

commented out the vachan-api-test container and Run test in workflow
Bridgeconn · Aug 29, 2024 · 3a6ecf6 · 3a6ecf6
2 parents d0c8ba0 + ed89817
commit 3a6ecf6
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 100 deletions.
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -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
diff --git a/docker/docker-compose-production.yml b/docker/docker-compose-production.yml
@@ -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

diff --git a/docker/docker-compose-staging.yml b/docker/docker-compose-staging.yml
@@ -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

diff --git a/docs/docker-guide.md b/docs/docker-guide.md
@@ -59,7 +59,7 @@ To turn the app down, use
 ```docker compose -f docker-compose-staging.yml --profile local-run down```
 
 
-## To run tests
+<!-- ## To run tests
 
 This method is recommended to just run all the tests once to make sure everything works, like in production, CI/CD or locally when verifying a PR. While doing local development and when we may have to run tests selectively and multiple times, after code changes, use the method specificed in [readme](../README.md#set-up-locally-for-development-and-testingwithout-docker).
 
@@ -70,7 +70,7 @@ docker compose -f docker-compose-staging.yml run vachan-api-test --build
 
 To turn down the running containers after test has been exited,
 
-```docker compose -f docker-compose-staging.yml down```
+```docker compose -f docker-compose-staging.yml down``` -->
 
 ## To deploy on server
 Install docker, docker-compose & git and set up the right repo and branch.