From 348e23ca6f9dc9c486178e61759feb8972cf4487 Mon Sep 17 00:00:00 2001
From: Akash Jain <15995028+akash-jain-10@users.noreply.github.com>
Date: Tue, 4 Jan 2022 12:49:22 +0530
Subject: [PATCH] fix/ci-workflows (#1997)

* add pytest and pytest-cov

* add timeout; update make command usages
---
 .github/workflows/py-integration-tests.yml | 10 +++++-----
 .github/workflows/selenium-tests.yml       |  1 +
 ingestion/requirements-test.txt            |  2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/py-integration-tests.yml b/.github/workflows/py-integration-tests.yml
index 357a837cda5..b61d091ac6c 100644
--- a/.github/workflows/py-integration-tests.yml
+++ b/.github/workflows/py-integration-tests.yml
@@ -32,20 +32,20 @@ jobs:
         distribution: 'adopt'
     - name: Start Server and Ingest Sample Data
       run: ./docker/run_local_docker.sh
+      timeout-minutes: 20
     - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
         python-version: 3.9
-    - name: Install Ubuntu related dependencies
+    - name: Install Ubuntu dependencies
       run: |
         sudo apt-get install -y libsasl2-dev unixodbc-dev python3-venv
-    - name: Install Python & Openmetadata related dependencies
+    - name: Install open-metadata dependencies
       run: |
         python3 -m venv env
         source env/bin/activate
-        make install install_test
-        pip install pytest pytest-cov
-    - name: Run Integration Tests
+        make install_test install_dev generate install
+    - name: Run Python Integration Tests
       run: |
         source env/bin/activate
         make run_ometa_integration_tests
diff --git a/.github/workflows/selenium-tests.yml b/.github/workflows/selenium-tests.yml
index 71813605822..744029c0c7d 100644
--- a/.github/workflows/selenium-tests.yml
+++ b/.github/workflows/selenium-tests.yml
@@ -44,6 +44,7 @@ jobs:
 
     - name: Start Server and Ingest Sample Data
       run: ./docker/run_local_docker.sh
+      timeout-minutes: 20
 
     - name: Run Page Tests
       run: mvn clean test -Dtest="org.openmetadata.catalog.selenium.pages.**.*.java" -DfailIfNoTests=false
diff --git a/ingestion/requirements-test.txt b/ingestion/requirements-test.txt
index 0bfae50dce3..c64deea5b81 100644
--- a/ingestion/requirements-test.txt
+++ b/ingestion/requirements-test.txt
@@ -2,4 +2,6 @@ black
 isort
 pre-commit
 pylint
+pytest
+pytest-cov
 faker
\ No newline at end of file