refactor: move test file structure (#1629)

* refactor: move ci file structure
jina-ai · Jan 8, 2021 · 8d63a8e · 8d63a8e
1 parent 4b67bce
commit 8d63a8e
Show file tree

Hide file tree

Showing 87 changed files with 88 additions and 268 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -120,13 +120,12 @@ jobs:
           buildoptions: ${{ matrix.build_option }}
           tags: "${{ matrix.tag_prefix }}devel, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}"
 
-  unit-test:
-    needs: update-docker
-    runs-on: ${{ matrix.os }}
+  core-test:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest] #[macos-latest, ubuntu-latest]
-        python-version: [3.7]
+        python-version: [3.7, 3.8]
+        test-path: ['unit', 'integration']
 
     steps:
       - uses: actions/checkout@v2
@@ -136,112 +135,25 @@ jobs:
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
+      - name: Install and test
         run: |
           python -m pip install --upgrade pip
           pip install .[cicd] --no-cache-dir
-      - name: Lint with flake8
-        run: |
-          pip install flake8
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude .git,__pycache__,docs/source/conf.py,old,build,dist,tests/,jina/hub/
-          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude .git,__pycache__,docs/source/conf.py,old,build,dist,tests/,jina/hub/
-      - name: Test docker install
-        run: |
-          docker build  -f Dockerfiles/pip.Dockerfile -t jinaai/jina:test-pip .
           docker build --build-arg PIP_TAG="[devel]" -f Dockerfiles/pip.Dockerfile -t jinaai/jina:test-pip .
-      - name: Test with pytest
-        run: |
-          # make sure docker exist
-          docker ps
-          jina check
-          export JINA_LOG_VERBOSITY="ERROR"
-          pip install .[test]
-          pytest --force-flaky --min-passes 1 --max-runs 5 --cov=jina --cov-report=xml -n 1 --timeout=120 -v tests/unit
-          mv coverage.xml unit-test-coverage.xml
-        timeout-minutes: 30
-        env:
-          JINAHUB_USERNAME: ${{ secrets.JINAHUB_USERNAME }}
-          JINAHUB_PASSWORD: ${{ secrets.JINAHUB_PASSWORD }}
-      - name: Upload coverage result from unit-test
-        if: ${{ matrix.python-version }} == 3.7 && ${{ matrix.os }} == ubuntu-latest
-        uses: actions/upload-artifact@v1
-        with:
-          name: unit-test-codecoverage
-          path: ./unit-test-coverage.xml
-
-  integration-test:
-    needs: update-docker
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest] #[macos-latest, ubuntu-latest]
-        python-version: [3.7,]
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install .[cicd] --no-cache-dir
-      - name: Test with pytest
-        run: |
-          # make sure docker exist
-          docker ps
           jina check
-          docker build  -f Dockerfiles/pip.Dockerfile -t jinaai/jina:test-pip .
           export JINA_LOG_VERBOSITY="ERROR"
           pip install .[test]
-          pytest --force-flaky --min-passes 1 --max-runs 5 --cov=jina --cov-report=xml -n 1 --timeout=120 --ignore-glob='tests/integration/hub_usage/dummyhub*' -v tests/integration
-          mv coverage.xml integration-test-coverage.xml
-        timeout-minutes: 30
+          pytest --force-flaky --min-passes 1 --max-runs 5 --cov=jina --cov-report=xml -n 1 --timeout=120 -v --ignore-glob='tests/integration/hub_usage/dummyhub*' tests/${{ matrix.test-path }}
+        timeout-minutes: 40
         env:
           JINAHUB_USERNAME: ${{ secrets.JINAHUB_USERNAME }}
           JINAHUB_PASSWORD: ${{ secrets.JINAHUB_PASSWORD }}
-      - name: Upload coverage result from integration-test
-        if: ${{ matrix.python-version }} == 3.7 && ${{ matrix.os }} == ubuntu-latest
-        uses: actions/upload-artifact@v1
-        with:
-          name: integration-test-codecoverage
-          path: ./integration-test-coverage.xml
-
-  codecov:
-    needs: [unit-test, integration-test]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: [3.7]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Download coverage result from unit-test
-        uses: actions/download-artifact@v1
-        with:
-          name: unit-test-codecoverage
-      - name: Download coverage result from integration-test
-        uses: actions/download-artifact@v1
-        with:
-          name: integration-test-codecoverage
-      - name: Upload coverage from unit-test to Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          file: unit-test-codecoverage/unit-test-coverage.xml
-          env_vars: OS,PYTHON
-          name: codecov
-          fail_ci_if_error: true
-      - name: Upload coverage from integration-test to Codecov
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload coverage from test to Codecov
         uses: codecov/codecov-action@v1
+        if: ${{ matrix.python-version }} == 3.7
         with:
-          file: integration-test-codecoverage/integration-test-coverage.xml
-          env_vars: OS,PYTHON
-          name: codecov
-          fail_ci_if_error: true
+          file: coverage.xml
+          name: ${{ matrix.test-path }}-codecov
+          flags: ${{ matrix.test-path }}, cd
+          fail_ci_if_error: false
diff --git a/.github/workflows/test-hubapp-hubpods.yml → .github/workflows/ci-hub.yml b/.github/workflows/test-hubapp-hubpods.yml → .github/workflows/ci-hub.yml
@@ -4,11 +4,10 @@ on:
   pull_request:
 
 jobs:
-  hubapp-hubpod-test:
-    runs-on: ${{ matrix.os }}
+  hub-test:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest]
         python-version: [3.7, 3.8]
 
     steps:
@@ -21,7 +20,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Test hubapp with hubpods
         run: |
-          ./tests/integration/hubapp_hubpods/test_integration.sh
+          ./tests/jinahub/test_integration.sh
         timeout-minutes: 30
         env:
           JINAHUB_USERNAME: ${{ secrets.JINAHUB_USERNAME }}

diff --git a/.github/workflows/ci-jinad.yml b/.github/workflows/ci-jinad.yml
@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  pull_request:
+#    paths-ignore:
+#      - 'README.md'
+#      - '.all-contributorsrc'
+#      - 'docs/*'
+
+jobs:
+  daemon-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7, 3.8]
+        test-path: ['unit', 'integration']
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install ".[cicd,daemon,test]" --no-cache-dir
+          docker build --build-arg PIP_TAG="[devel]" -f Dockerfiles/pip.Dockerfile -t jinaai/jina:test-pip .
+          export JINA_LOG_VERBOSITY="ERROR"
+          pytest --force-flaky --min-passes 1 --max-runs 5 --cov=jina --cov-report=xml -n 1 --timeout=120 -v tests/jinad/${{ matrix.test-path }}
+        timeout-minutes: 40
+        env:
+          JINAHUB_USERNAME: ${{ secrets.JINAHUB_USERNAME }}
+          JINAHUB_PASSWORD: ${{ secrets.JINAHUB_PASSWORD }}
+      - name: Upload coverage from test to Codecov
+        uses: codecov/codecov-action@v1
+        if: ${{ matrix.python-version }} == 3.7
+        with:
+          file: coverage.xml
+          name: jinad-${{ matrix.python-version }}-${{ matrix.test-path }}-codecov
+          flags: ${{ matrix.test-path }}, jinad, ci
+          fail_ci_if_error: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,14 +71,13 @@ jobs:
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude .git,__pycache__,docs/source/conf.py,old,build,dist,tests/,jina/hub/
 
-
-  unit-test:
+  core-test:
     needs: lint-flake-8
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest] #[macos-latest, ubuntu-latest]
         python-version: [3.7, 3.8]
+        test-path: ['unit', 'integration']
 
     steps:
       - uses: actions/checkout@v2
@@ -95,98 +94,23 @@ jobs:
       - name: Test docker install
         run: |
           docker build --build-arg PIP_TAG="[devel]" -f Dockerfiles/pip.Dockerfile -t jinaai/jina:test-pip .
+          docker run jinaai/jina:test-pip hello-world
       - name: Test with pytest
         run: |
-          # make sure docker exist
-          docker ps
-          jina check
-          export JINA_LOG_VERBOSITY="ERROR"
-          pip install .[test]
-          pytest --force-flaky --min-passes 1 --max-runs 5 --cov=jina --cov-report=xml -n 1 --timeout=120 -v tests/unit
-          mv coverage.xml unit-test-coverage.xml
-        timeout-minutes: 40
-        env:
-          JINAHUB_USERNAME: ${{ secrets.JINAHUB_USERNAME }}
-          JINAHUB_PASSWORD: ${{ secrets.JINAHUB_PASSWORD }}
-      - name: Upload coverage result from unit-test
-        if: ${{ matrix.python-version }} == 3.7 && ${{ matrix.os }} == ubuntu-latest
-        uses: actions/upload-artifact@v1
-        with:
-          name: unit-test-codecoverage
-          path: ./unit-test-coverage.xml
-
-  integration-test:
-    needs: lint-flake-8
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest] #[macos-latest, ubuntu-latest]
-        python-version: [3.7, 3.8]
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install .[cicd] --no-cache-dir
-      - name: Test with pytest
-        run: |
-          # make sure docker exist
-          docker ps
-          docker build -f Dockerfiles/pip.Dockerfile -t jinaai/jina:test-pip .
-          docker run jinaai/jina:test-pip hello-world
           jina check
           export JINA_LOG_VERBOSITY="ERROR"
           pip install .[test]
-          pytest --force-flaky --min-passes 1 --max-runs 5 --cov=jina --cov-report=xml -n 1 --timeout=120 -v --ignore-glob='tests/integration/hub_usage/dummyhub*' tests/integration
-          mv coverage.xml integration-test-coverage.xml
+          pytest --force-flaky --min-passes 1 --max-runs 5 --cov=jina --cov-report=xml -n 1 --timeout=120 -v --ignore-glob='tests/integration/hub_usage/dummyhub*' tests/${{ matrix.test-path }}
         timeout-minutes: 40
         env:
           JINAHUB_USERNAME: ${{ secrets.JINAHUB_USERNAME }}
           JINAHUB_PASSWORD: ${{ secrets.JINAHUB_PASSWORD }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload coverage result from integration-test
-        if: ${{ matrix.python-version }} == 3.7 && ${{ matrix.os }} == ubuntu-latest
-        uses: actions/upload-artifact@v1
-        with:
-          name: integration-test-codecoverage
-          path: ./integration-test-coverage.xml
-
-  codecov:
-    needs: [unit-test, integration-test]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: false
-      - uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
-      - name: Download coverage result from unit-test
-        uses: actions/download-artifact@v1
-        with:
-          name: unit-test-codecoverage
-      - name: Download coverage result from integration-test
-        uses: actions/download-artifact@v1
-        with:
-          name: integration-test-codecoverage
-      - name: Upload coverage from unit-test to Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          file: unit-test-codecoverage/unit-test-coverage.xml
-          env_vars: OS,PYTHON
-          name: codecov
-          fail_ci_if_error: false
-      - name: Upload coverage from integration-test to Codecov
+      - name: Upload coverage from test to Codecov
         uses: codecov/codecov-action@v1
+        if: ${{ matrix.python-version }} == 3.7
         with:
-          file: integration-test-codecoverage/integration-test-coverage.xml
-          env_vars: OS,PYTHON
-          name: codecov
+          file: coverage.xml
+          name: ${{ matrix.python-version }}-${{ matrix.test-path }}-codecov
+          flags: ${{ matrix.test-path }}, core, ci
           fail_ci_if_error: false
diff --git a/.github/workflows/test-examples.yml b/.github/workflows/test-examples.yml
diff --git a/tests/integration/daemon/__init__.py → ...ration/encode_driver_batching/__init__.py b/tests/integration/daemon/__init__.py → ...ration/encode_driver_batching/__init__.py
diff --git a/...r-batching/test_encode_driver_batching.py → ...r_batching/test_encode_driver_batching.py b/...r-batching/test_encode_driver_batching.py → ...r_batching/test_encode_driver_batching.py