Merge branch 'master' into 2351-renku-rollback

SwissDataScienceCenter · Nov 23, 2021 · c69f7b7 · c69f7b7
2 parents 8d3fd1c + 6780b59
commit c69f7b7
Show file tree

Hide file tree

Showing 197 changed files with 5,345 additions and 3,287 deletions.
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -27,6 +27,7 @@ jobs:
       renku-notebooks: ${{ steps.deploy-comment.outputs.renku-notebooks}}
       renku-ui: ${{ steps.deploy-comment.outputs.renku-ui}}
       test-enabled: ${{ steps.deploy-comment.outputs.test-enabled}}
+      extra-values: ${{ steps.deploy-comment.outputs.extra-values}}
     steps:
       - id: deploy-comment
         uses: SwissDataScienceCenter/renku-actions/check-pr-description@v0.2.0
@@ -64,6 +65,7 @@ jobs:
         renku_graph: "${{ needs.check-deploy.outputs.renku-graph }}"
         renku_notebooks: "${{ needs.check-deploy.outputs.renku-notebooks }}"
         renku_ui: "${{ needs.check-deploy.outputs.renku-ui }}"
+        extra_values: "${{ needs.check-deploy.outputs.extra-values }}"
     - name: Check existing renkubot comment
       uses: peter-evans/find-comment@v1
       id: findcomment

diff --git a/.github/workflows/test_deploy.yml b/.github/workflows/test_deploy.yml
@@ -452,8 +452,63 @@ jobs:
         ZENODO_ACCESS_TOKEN: ${{ secrets.ZENODO_ACCESS_TOKEN }}
         OLOS_ACCESS_TOKEN: ${{ secrets.OLOS_ACCESS_TOKEN }}
         RENKU_REQUESTS_TIMEOUT_SECONDS: 120
-      run: pytest -m "integration and not serial" -v --timeout=600 -n auto
-    - name: Test with pytest(serial)
+      run: pytest -m "integration and not service and not serial" -v --timeout=600 -n auto
+    - name: Test with pytest (serial)
+      env:
+        LANG: en_US.UTF-8
+        LC_ALL: en_US.UTF-8
+        DATAVERSE_ACCESS_TOKEN: ${{ secrets.DATAVERSE_ACCESS_TOKEN }}
+        IT_OAUTH_GIT_TOKEN: ${{ secrets.IT_OAUTH_GIT_TOKEN }}
+        ZENODO_ACCESS_TOKEN: ${{ secrets.ZENODO_ACCESS_TOKEN }}
+        OLOS_ACCESS_TOKEN: ${{ secrets.OLOS_ACCESS_TOKEN }}
+        RENKU_REQUESTS_TIMEOUT_SECONDS: 120
+      run: pytest --cov-append -m "integration and not service and serial" -v --timeout=600
+    - name: Coveralls
+      env:
+        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        GITHUB_TOKEN: $COVERALLS_REPO_TOKEN
+        RENKU_REQUESTS_TIMEOUT_SECONDS: 120
+        COVERALLS_PARALLEL: true
+      run: coveralls --service=github-actions
+      continue-on-error: true
+
+  test-linux-integration-service:
+    runs-on: ubuntu-latest
+    needs: [set-matrix]
+    strategy:
+      max-parallel: 3
+      matrix: ${{fromJson(needs.set-matrix.outputs.matrix)}}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install system packages
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y libyaml-0-2 libyaml-dev
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install coveralls setuptools wheel
+        python -m pip install .[nodocs]
+        git config --global --add user.name "Renku @ SDSC"
+        git config --global --add user.email "renku@datascience.ch"
+    - name: Test with pytest
+      env:
+        LANG: en_US.UTF-8
+        LC_ALL: en_US.UTF-8
+        DATAVERSE_ACCESS_TOKEN: ${{ secrets.DATAVERSE_ACCESS_TOKEN }}
+        IT_OAUTH_GIT_TOKEN: ${{ secrets.IT_OAUTH_GIT_TOKEN }}
+        ZENODO_ACCESS_TOKEN: ${{ secrets.ZENODO_ACCESS_TOKEN }}
+        OLOS_ACCESS_TOKEN: ${{ secrets.OLOS_ACCESS_TOKEN }}
+        RENKU_REQUESTS_TIMEOUT_SECONDS: 120
+      run: pytest -m "integration and service and not serial" -v --timeout=600 -n auto
+    - name: Test with pytest (serial)
       env:
         LANG: en_US.UTF-8
         LC_ALL: en_US.UTF-8
@@ -462,7 +517,7 @@ jobs:
         ZENODO_ACCESS_TOKEN: ${{ secrets.ZENODO_ACCESS_TOKEN }}
         OLOS_ACCESS_TOKEN: ${{ secrets.OLOS_ACCESS_TOKEN }}
         RENKU_REQUESTS_TIMEOUT_SECONDS: 120
-      run: pytest --cov-append -m "integration and serial" -v --timeout=600
+      run: pytest --cov-append -m "integration and service and serial" -v --timeout=600
     - name: Coveralls
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
@@ -573,7 +628,7 @@ jobs:
 
   publish-chart:
     runs-on: ubuntu-latest
-    needs: [docs-linux, test-linux-cli, test-linux-core, test-linux-service, test-macos-cli, test-macos-core, test-macos-service, test-linux-integration, test-macos-integration]
+    needs: [docs-linux, test-linux-cli, test-linux-core, test-linux-service, test-macos-cli, test-macos-core, test-macos-service, test-linux-integration, test-linux-integration-service, test-macos-integration]
     if: startsWith(github.ref, 'refs/tags/')
     steps:
     - uses: actions/checkout@v2
@@ -600,7 +655,7 @@ jobs:
 
   coveralls-final:
     name: Aggregate coveralls data
-    needs: [test-linux-cli, test-linux-core, test-linux-service, test-linux-api, test-linux-integration]
+    needs: [test-linux-cli, test-linux-core, test-linux-service, test-linux-api, test-linux-integration, test-linux-integration-service]
     runs-on: ubuntu-latest
     permissions:
         contents: read