From f39d07ff4be6542a326a710444323022bf1f55bc Mon Sep 17 00:00:00 2001 From: Gleb Sizov Date: Tue, 6 Aug 2024 15:52:55 +0200 Subject: [PATCH] Added SD_ZIP_ARTIFACTS environment variable to cloudintegration workflows, commented out corresponding screwdriver workflows --- .github/workflows/integration-cloud-token.yml | 1 + .../integration-cloud-vector-search.yml | 1 + .github/workflows/integration-cloud.yml | 1 + screwdriver.yaml | 114 +++++++++--------- 4 files changed, 60 insertions(+), 57 deletions(-) diff --git a/.github/workflows/integration-cloud-token.yml b/.github/workflows/integration-cloud-token.yml index dfaf2423..65f2bca3 100644 --- a/.github/workflows/integration-cloud-token.yml +++ b/.github/workflows/integration-cloud-token.yml @@ -29,5 +29,6 @@ jobs: env: VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }} CO_API_KEY: ${{ secrets.VESPA_CLOUD_SECRET_TOKEN }} + SD_ZIP_ARTIFACTS: true run: | pytest tests/integration/test_integration_vespa_cloud_token.py -s -v diff --git a/.github/workflows/integration-cloud-vector-search.yml b/.github/workflows/integration-cloud-vector-search.yml index 62ee24af..ad3852c7 100644 --- a/.github/workflows/integration-cloud-vector-search.yml +++ b/.github/workflows/integration-cloud-vector-search.yml @@ -29,5 +29,6 @@ jobs: env: VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }} CO_API_KEY: ${{ secrets.VESPA_CLOUD_SECRET_TOKEN }} + SD_ZIP_ARTIFACTS: true run: | pytest tests/integration/test_integration_vespa_cloud_vector_search.py -s -v diff --git a/.github/workflows/integration-cloud.yml b/.github/workflows/integration-cloud.yml index eccd154f..cb7e76fa 100644 --- a/.github/workflows/integration-cloud.yml +++ b/.github/workflows/integration-cloud.yml @@ -28,5 +28,6 @@ jobs: - name: Run integration tests env: VESPA_TEAM_API_KEY: ${{ secrets.VESPA_TEAM_API_KEY }} + SD_ZIP_ARTIFACTS: true run: | pytest tests/integration/test_integration_vespa_cloud.py -s -v diff --git a/screwdriver.yaml b/screwdriver.yaml index 7c389aca..b7603852 100644 --- 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