Merge branch 'master' into glebashnik/integration-except-cloud-to-git…

…hub-action
vespa-engine · Aug 8, 2024 · 40db63a · 40db63a
2 parents f9e0ffc + afb8f61
commit 40db63a
Show file tree

Hide file tree

Showing 2 changed files with 137 additions and 57 deletions.
diff --git a/.github/workflows/integration-cloud.yml b/.github/workflows/integration-cloud.yml
@@ -0,0 +1,80 @@
+name: Integration - cloud
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  schedule:
+   - cron: '0 11 * * *'
+
+jobs:
+  integration-cloud:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+          cache: 'pip'
+          cache-dependency-path: |
+            pyproject.toml
+            **/notebook_requirements.txt
+      - name: Install dependencies
+        run: |
+          pip install -e .[dev]
+      - name: Run integration tests
+        env:
+          VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }}
+        run: |
+          pytest tests/integration/test_integration_vespa_cloud.py -s -v
+
+  integration-cloud-token:
+    needs: integration-cloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+          cache: 'pip'
+          cache-dependency-path: |
+            pyproject.toml
+            **/notebook_requirements.txt
+      - name: Install dependencies
+        run: |
+          pip install -e .[dev]
+      - name: Run integration tests
+        env:
+          VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }}
+          VESPA_CLOUD_SECRET_TOKEN: ${{ secrets.VESPA_CLOUD_SECRET_TOKEN }}
+          VESPA_CLIENT_TOKEN_ID: ${{ secrets.VESPA_CLIENT_TOKEN_ID}}
+        run: |
+          pytest tests/integration/test_integration_vespa_cloud_token.py -s -v
+
+  integration-cloud-vector-search:
+    needs: integration-cloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+          cache: 'pip'
+          cache-dependency-path: |
+            pyproject.toml
+            **/notebook_requirements.txt
+      - name: Install dependencies
+        run: |
+          pip install -e .[dev]
+      - name: Run integration tests
+        env:
+          VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }}
+        run: |
+          pytest tests/integration/test_integration_vespa_cloud_vector_search.py -s -v
diff --git a/screwdriver.yaml b/screwdriver.yaml
@@ -109,64 +109,64 @@ jobs:
             fi
           done
 
-  integration-cloud:
-    requires: [~commit]
-    annotations:
-      screwdriver.cd/timeout: 120
-      screwdriver.cd/cpu: HIGH
-      screwdriver.cd/ram: HIGH
-      screwdriver.cd/buildPeriodically: H 11 * * *
-    secrets:
-      - VESPA_TEAM_API_KEY
-    environment:
-      SD_ZIP_ARTIFACTS: true
-    steps:
-      - install-python: |
-          dnf install -y python39-pip
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -e .[dev]
-      - run-integration-cloud: |
-          pytest tests/integration/test_integration_vespa_cloud.py -s -v
+  # integration-cloud:
+  #   requires: [~commit]
+  #   annotations:
+  #     screwdriver.cd/timeout: 120
+  #     screwdriver.cd/cpu: HIGH
+  #     screwdriver.cd/ram: HIGH
+  #     screwdriver.cd/buildPeriodically: H 11 * * *
+  #   secrets:
+  #     - VESPA_TEAM_API_KEY
+  #   environment:
+  #     SD_ZIP_ARTIFACTS: true
+  #   steps:
+  #     - install-python: |
+  #         dnf install -y python39-pip
+  #         python3 -m pip install --upgrade pip
+  #         python3 -m pip install -e .[dev]
+  #     - run-integration-cloud: |
+  #         pytest tests/integration/test_integration_vespa_cloud.py -s -v
 
-  integration-cloud-token:
-    requires: [~commit]
-    annotations:
-      screwdriver.cd/timeout: 120
-      screwdriver.cd/cpu: HIGH
-      screwdriver.cd/ram: HIGH
-      screwdriver.cd/buildPeriodically: H 11 * * *
-    secrets:
-      - VESPA_TEAM_API_KEY
-      - VESPA_CLOUD_SECRET_TOKEN
-    environment:
-      SD_ZIP_ARTIFACTS: true
-    steps:
-      - install-python: |
-          dnf install -y python39-pip
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -e .[dev]
-      - run-integration-cloud: |
-          pytest tests/integration/test_integration_vespa_cloud_token.py -s -v
+  # integration-cloud-token:
+  #   requires: [~commit]
+  #   annotations:
+  #     screwdriver.cd/timeout: 120
+  #     screwdriver.cd/cpu: HIGH
+  #     screwdriver.cd/ram: HIGH
+  #     screwdriver.cd/buildPeriodically: H 11 * * *
+  #   secrets:
+  #     - VESPA_TEAM_API_KEY
+  #     - VESPA_CLOUD_SECRET_TOKEN
+  #   environment:
+  #     SD_ZIP_ARTIFACTS: true
+  #   steps:
+  #     - install-python: |
+  #         dnf install -y python39-pip
+  #         python3 -m pip install --upgrade pip
+  #         python3 -m pip install -e .[dev]
+  #     - run-integration-cloud: |
+  #         pytest tests/integration/test_integration_vespa_cloud_token.py -s -v
 
-  integration-cloud-vector-search:
-    requires: [~commit]
-    annotations:
-      screwdriver.cd/timeout: 120
-      screwdriver.cd/cpu: HIGH
-      screwdriver.cd/ram: HIGH
-      screwdriver.cd/buildPeriodically: H 11 * * *
-    secrets:
-      - VESPA_TEAM_API_KEY
-      - VESPA_CLOUD_SECRET_TOKEN
-    environment:
-      SD_ZIP_ARTIFACTS: true
-    steps:
-      - install-python: |
-          dnf install -y python39-pip
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -e .[dev]
-      - run-integration-cloud: |
-          pytest tests/integration/test_integration_vespa_cloud_vector_search.py -s -v
+  # integration-cloud-vector-search:
+  #   requires: [~commit]
+  #   annotations:
+  #     screwdriver.cd/timeout: 120
+  #     screwdriver.cd/cpu: HIGH
+  #     screwdriver.cd/ram: HIGH
+  #     screwdriver.cd/buildPeriodically: H 11 * * *
+  #   secrets:
+  #     - VESPA_TEAM_API_KEY
+  #     - VESPA_CLOUD_SECRET_TOKEN
+  #   environment:
+  #     SD_ZIP_ARTIFACTS: true
+  #   steps:
+  #     - install-python: |
+  #         dnf install -y python39-pip
+  #         python3 -m pip install --upgrade pip
+  #         python3 -m pip install -e .[dev]
+  #     - run-integration-cloud: |
+  #         pytest tests/integration/test_integration_vespa_cloud_vector_search.py -s -v
 
   # notebooks-cloud:
   #   requires: [integration-cloud]
@@ -188,7 +188,7 @@ jobs:
   #         python3 -m pip install -e .[dev]
   #         python3 -m pip install -r docs/sphinx/source/requirements.txt
   #         python3 -m pip install -r docs/sphinx/source/notebook_requirements.txt
-      
+
   #     - run-notebooks-cloud-related: |
   #         echo "PATH:"
   #         echo $PATH