Skip to content

Commit

Permalink
ci: move scheduled tests into a single workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoloboschi committed Jan 31, 2024
1 parent 3156bc7 commit 8f4de64
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/_run_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: Run E2E tests
on:
workflow_call:
inputs:
title:
description: 'Title'
required: true
type: string
suite-name:
type: string
run-tests:
Expand Down Expand Up @@ -38,10 +42,6 @@ on:
description: 'Whether to deploy to Slack or not'
default: true
type: boolean
slack-title:
description: 'Slack report title'
required: false
type: string
deploy-to-testspace:
description: 'Whether to deploy to TestSpace or not'
default: false
Expand All @@ -55,6 +55,7 @@ on:

jobs:
tests:
name: "${{ inputs.title }}"
runs-on: ubuntu-latest
steps:
- name: Check out the repo
Expand Down Expand Up @@ -156,7 +157,7 @@ jobs:
uses: ./.github/actions/deploy-slack-report
with:
from-report-file: "ragstack-e2e-tests/failed-tests-report.txt"
type: "${{ inputs.slack-title }}"
type: "${{ inputs.title }}"
outcome: ${{ steps.e2e-tests.outcome }}
commit-url: "${{ steps.info.outputs.commit-url }}"
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ jobs:
uses: ./.github/workflows/_run_e2e_tests.yml
secrets: inherit
with:
title: "RAGStack dev / DSE"
suite-name: "ragstack"
astradb: false
vector-database-type: "local-cassandra"
deploy-to-slack: true
slack-title: "RAGStack dev / DSE"
deploy-to-testspace: ${{ needs.preconditions.outputs.is-scheduled == 'true' }}
testspace-space: "RAGStack test suite - RAGStack dev - DSE"

Expand All @@ -54,6 +54,7 @@ jobs:
uses: ./.github/workflows/_run_e2e_tests.yml
secrets: inherit
with:
title: "RAGStack dev / AstraDB dev"
suite-name: "ragstack"
astradb: true
astradb-token-secret-name: "E2E_TESTS_ASTRA_DEV_DB_TOKEN"
Expand All @@ -62,7 +63,6 @@ jobs:
astradb-cloud: "${{ needs.preconditions.outputs.astradb-dev-cloud }}"
vector-database-type: "astradb"
deploy-to-slack: true
slack-title: "RAGStack dev / AstraDB dev"
deploy-to-testspace: ${{ needs.preconditions.outputs.is-scheduled == 'true' }}
testspace-space: "RAGStack test suite - RAGStack dev - AstraDB"

Expand All @@ -72,11 +72,11 @@ jobs:
uses: ./.github/workflows/_run_e2e_tests.yml
secrets: inherit
with:
title: "LangChain dev / DSE"
suite-name: "langchain"
astradb: false
vector-database-type: "local-cassandra"
deploy-to-slack: true
slack-title: "LangChain dev / DSE"
deploy-to-testspace: ${{ needs.preconditions.outputs.is-scheduled == 'true' }}
testspace-space: "RAGStack test suite - LangChain dev - DSE"

Expand All @@ -87,6 +87,7 @@ jobs:
uses: ./.github/workflows/_run_e2e_tests.yml
secrets: inherit
with:
title: "LangChain dev / AstraDB dev"
suite-name: "langchain"
astradb: true
astradb-token-secret-name: "E2E_TESTS_ASTRA_DEV_DB_TOKEN"
Expand All @@ -95,7 +96,6 @@ jobs:
astradb-cloud: "${{ needs.preconditions.outputs.astradb-dev-cloud }}"
vector-database-type: "astradb"
deploy-to-slack: true
slack-title: "LangChain dev / AstraDB dev"
deploy-to-testspace: ${{ needs.preconditions.outputs.is-scheduled == 'true' }}
testspace-space: "RAGStack test suite - LangChain dev - AstraDB"

Expand All @@ -105,11 +105,11 @@ jobs:
uses: ./.github/workflows/_run_e2e_tests.yml
secrets: inherit
with:
title: "LLamaIndex dev / DSE"
suite-name: "llamaindex"
astradb: false
vector-database-type: "local-cassandra"
deploy-to-slack: true
slack-title: "LLamaIndex dev / DSE"
deploy-to-testspace: ${{ needs.preconditions.outputs.is-scheduled == 'true' }}
testspace-space: "RAGStack test suite - LLamaIndex dev - DSE"

Expand All @@ -120,6 +120,7 @@ jobs:
uses: ./.github/workflows/_run_e2e_tests.yml
secrets: inherit
with:
title: "LLamaIndex dev / AstraDB dev"
suite-name: "llamaindex"
astradb: true
astradb-token-secret-name: "E2E_TESTS_ASTRA_DEV_DB_TOKEN"
Expand All @@ -128,7 +129,6 @@ jobs:
astradb-cloud: "${{ needs.preconditions.outputs.astradb-dev-cloud }}"
vector-database-type: "astradb"
deploy-to-slack: true
slack-title: "LLamaIndex dev / AstraDB dev"
deploy-to-testspace: ${{ needs.preconditions.outputs.is-scheduled == 'true' }}
testspace-space: "RAGStack test suite - LLamaIndex dev - AstraDB"

Expand All @@ -138,11 +138,11 @@ jobs:
uses: ./.github/workflows/_run_e2e_tests.yml
secrets: inherit
with:
title: "RAGStack latest / DSE"
suite-name: "ragstack-latest-release"
astradb: false
vector-database-type: "local-cassandra"
deploy-to-slack: true
slack-title: "RAGStack latest / DSE"
deploy-to-testspace: ${{ needs.preconditions.outputs.is-scheduled == 'true' }}
testspace-space: "RAGStack test suite - RAGStack latest - DSE"

Expand All @@ -153,6 +153,7 @@ jobs:
uses: ./.github/workflows/_run_e2e_tests.yml
secrets: inherit
with:
title: "RAGStack latest / AstraDB dev"
suite-name: "ragstack-latest-release"
astradb: true
astradb-token-secret-name: "E2E_TESTS_ASTRA_DEV_DB_TOKEN"
Expand All @@ -161,6 +162,5 @@ jobs:
astradb-cloud: "${{ needs.preconditions.outputs.astradb-dev-cloud }}"
vector-database-type: "astradb"
deploy-to-slack: true
slack-title: "RAGStack latest / AstraDB dev"
deploy-to-testspace: ${{ needs.preconditions.outputs.is-scheduled == 'true' }}
testspace-space: "RAGStack test suite - RAGStack latest - AstraDB"

0 comments on commit 8f4de64

Please sign in to comment.