From e961446050f066648d56e2671af02c61589929f6 Mon Sep 17 00:00:00 2001 From: Cedrick Lunven Date: Fri, 25 Oct 2024 17:16:52 +0200 Subject: [PATCH 1/9] fixing local deployments --- .../com/datastax/astra/client/admin/DataAPIDatabaseAdmin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/admin/DataAPIDatabaseAdmin.java b/astra-db-java/src/main/java/com/datastax/astra/client/admin/DataAPIDatabaseAdmin.java index 84c31810..3775e476 100644 --- a/astra-db-java/src/main/java/com/datastax/astra/client/admin/DataAPIDatabaseAdmin.java +++ b/astra-db-java/src/main/java/com/datastax/astra/client/admin/DataAPIDatabaseAdmin.java @@ -220,7 +220,7 @@ public void dropKeyspace(String keyspace) { /** {@inheritDoc} */ @Override protected String getApiEndpoint() { - return db.getDbApiEndpoint(); + return db.getDbApiEndpoint() + "/v1"; } /** From dfbbbefcac53d1888067dd52a1f42788445737d2 Mon Sep 17 00:00:00 2001 From: Cedrick Lunven Date: Fri, 25 Oct 2024 17:19:55 +0200 Subject: [PATCH 2/9] prepare for release --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cdba78c4..068ef919 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ astra-db-java langchain4j-astradb - examples - tools + + From 8a27efafad70d919d2a03ee6b0a144289fa4a775 Mon Sep 17 00:00:00 2001 From: Cedrick Lunven Date: Fri, 25 Oct 2024 17:20:17 +0200 Subject: [PATCH 3/9] [maven-release-plugin] prepare release 1.5.3 --- astra-db-java/pom.xml | 2 +- langchain4j-astradb/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/astra-db-java/pom.xml b/astra-db-java/pom.xml index 4282503d..781f4fad 100644 --- a/astra-db-java/pom.xml +++ b/astra-db-java/pom.xml @@ -8,7 +8,7 @@ com.datastax.astra astra-db-java-parent - 1.5.3-SNAPSHOT + 1.5.3 diff --git a/langchain4j-astradb/pom.xml b/langchain4j-astradb/pom.xml index 0098d8c5..d6f0f0c3 100644 --- a/langchain4j-astradb/pom.xml +++ b/langchain4j-astradb/pom.xml @@ -8,7 +8,7 @@ com.datastax.astra astra-db-java-parent - 1.5.3-SNAPSHOT + 1.5.3 diff --git a/pom.xml b/pom.xml index 068ef919..f6cc1498 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.datastax.astra astra-db-java-parent Data API Client - 1.5.3-SNAPSHOT + 1.5.3 pom https://github.com/datastax/astra-db-java 2024 @@ -329,7 +329,7 @@ scm:git:git@github.com:datastax/astra-db-java.git scm:git:git@github.com:datastax/astra-db-java.git https://github.com/datastax/astra-db-java - 1.4.6 + 1.5.3 From aa1dcaab61fe46bbd567734e16deeb53f28dd132 Mon Sep 17 00:00:00 2001 From: Cedrick Lunven Date: Fri, 25 Oct 2024 17:20:21 +0200 Subject: [PATCH 4/9] [maven-release-plugin] prepare for next development iteration --- astra-db-java/pom.xml | 2 +- langchain4j-astradb/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/astra-db-java/pom.xml b/astra-db-java/pom.xml index 781f4fad..e31b486c 100644 --- a/astra-db-java/pom.xml +++ b/astra-db-java/pom.xml @@ -8,7 +8,7 @@ com.datastax.astra astra-db-java-parent - 1.5.3 + 1.5.4-SNAPSHOT diff --git a/langchain4j-astradb/pom.xml b/langchain4j-astradb/pom.xml index d6f0f0c3..271eae2c 100644 --- a/langchain4j-astradb/pom.xml +++ b/langchain4j-astradb/pom.xml @@ -8,7 +8,7 @@ com.datastax.astra astra-db-java-parent - 1.5.3 + 1.5.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index f6cc1498..294daa60 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.datastax.astra astra-db-java-parent Data API Client - 1.5.3 + 1.5.4-SNAPSHOT pom https://github.com/datastax/astra-db-java 2024 @@ -329,7 +329,7 @@ scm:git:git@github.com:datastax/astra-db-java.git scm:git:git@github.com:datastax/astra-db-java.git https://github.com/datastax/astra-db-java - 1.5.3 + 1.4.6 From 4982caf133635777b2fcfb1503fa4534a594a4b4 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Thu, 31 Oct 2024 12:56:44 -0400 Subject: [PATCH 5/9] Initial draft for unified GHA workflows --- .github/actions/checkout-and-build/action.yml | 35 ++++++ .../workflows/ci-astra-col-db-dbadmin.yaml | 90 ++++++++++++++ .github/workflows/ci-astra-dev-collection.yml | 20 +-- .github/workflows/ci-astra-dev-database.yml | 20 +-- .../workflows/ci-astra-dev-databaseadmin.yml | 20 +-- .github/workflows/ci-astra-dev-devops.yml | 20 +-- .github/workflows/ci-astra-dev-new.yml | 114 ++++++++++++++++++ .../ci-astra-dev-vectorize-aws-bedrock.yml | 20 +-- .../ci-astra-dev-vectorize-hf-dedicated.yml | 20 +-- .github/workflows/ci-astra-dev.yml | 100 +++++++++------ .github/workflows/ci-astra-devops.yaml | 90 ++++++++++++++ .github/workflows/ci-astra-prod-devops.yml | 20 +-- .../ci-astra-vectorize-bedrock-hf.yaml | 96 +++++++++++++++ 13 files changed, 569 insertions(+), 96 deletions(-) create mode 100644 .github/actions/checkout-and-build/action.yml create mode 100644 .github/workflows/ci-astra-col-db-dbadmin.yaml create mode 100644 .github/workflows/ci-astra-dev-new.yml create mode 100644 .github/workflows/ci-astra-devops.yaml create mode 100644 .github/workflows/ci-astra-vectorize-bedrock-hf.yaml diff --git a/.github/actions/checkout-and-build/action.yml b/.github/actions/checkout-and-build/action.yml new file mode 100644 index 00000000..a7a2a7d4 --- /dev/null +++ b/.github/actions/checkout-and-build/action.yml @@ -0,0 +1,35 @@ +name: 'Checkout & Build with Java' +description: 'Checkout code, set up JDK, and build with Maven' +inputs: + java_distribution: + description: 'JDK distribution to use' + required: true + default: 'adopt' + java_version: + description: 'JDK version to use' + required: true + default: '11.0' + cache_pkg_mgr_name: + description: 'Cache package manager to be used' + required: true + default: 'maven' + skip_tests_on_build: + description: 'Skip tests during Maven build' + required: false + default: 'true' +runs: + using: 'composite' + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Set up JDK ${{ inputs.java_version }} + uses: actions/setup-java@v4 + with: + distribution: ${{ inputs.java_distribution }} + java-version: ${{ inputs.java_version }} + cache: ${{ inputs.cache_pkg_mgr_name}} + + - name: Build with Maven + run: | + mvn install -Dmaven.test.skip=${{ inputs.skip_tests_on_build }} \ No newline at end of file diff --git a/.github/workflows/ci-astra-col-db-dbadmin.yaml b/.github/workflows/ci-astra-col-db-dbadmin.yaml new file mode 100644 index 00000000..7c431610 --- /dev/null +++ b/.github/workflows/ci-astra-col-db-dbadmin.yaml @@ -0,0 +1,90 @@ +name: Astra | Collection/DB/DBAdmin Integration Tests + +on: + #push: + # branches: [ main ] + #pull_request: + # branches: [ main ] + workflow_dispatch: + inputs: + java_distribution: + description: 'JDK distribution to use' + required: true + default: 'adopt' + options: ['adopt', 'temurin'] + java_version: + description: 'JDK version to use' + required: true + default: '11.0' + cache_pkg_mgr_name: + description: 'Cache package manager to be used' + required: true + default: 'maven' + skip_tests_on_build: + description: 'Skip tests during Maven build' + required: false + default: 'true' + test_to_run: + description: 'Test to run' + required: true + default: 'AstraDevCollectionITTest' + options: + - 'AstraDevCollectionITTest' + - 'AstraDevDatabaseITTest' + - 'AstraDevDatabaseAdminITTest' + - 'AstraProdCollectionITTest' + - 'AstraProdDatabaseITTest' + - 'AstraProdDatabaseAdminITTest' + +jobs: + BUILD: + runs-on: ubuntu-latest + steps: + - name: Checkout & Build + uses: ./.github/actions/build-with-maven + + run_dev_tests: + needs: BUILD + runs-on: ubuntu-latest + strategy: + matrix: + # We had to do it this way because same regions aren't testing in various Astra envs. + include: + - cloud_provider: 'AWS' + cloud_region: 'us-west-2' + astra_environment: 'DEV' + - cloud_provider: 'GCP' + cloud_region: 'europe-west4' + astra_environment: 'DEV' + - cloud_provider: 'GCP' + cloud_region: 'us-central1' + astra_environment: 'DEV' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ inputs.java_distribution }} + java-version: ${{ inputs.java_version }} + cache: ${{ inputs.cache_pkg_mgr_name }} + + - name: "Maven Test on ${{ matrix.cloud_provider }} - ${{ matrix.cloud_region }} [Astra DEV]" + if: ${{ matrix.astra_environment == 'DEV' }} + env: + ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} + ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }} + ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }} + run: | + cd astra-db-java + mvn test -Dtest=com.datastax.astra.test.integration.dev.${{ inputs.test_to_run }} + + - name: "Maven Test on ${{ matrix.cloud_provider }} - ${{ matrix.cloud_region }} [Astra PROD]" + if: ${{ matrix.astra_environment == 'PROD' }} + env: + ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }} + ASTRA_CLOUD_PROVIDER: ${{ matrix.cloud_provider }} + ASTRA_CLOUD_REGION: ${{ matrix.cloud_region }} + run: | + cd astra-db-java + mvn test -Dtest=com.datastax.astra.test.integration.prod.${{ inputs.test_to_run }} diff --git a/.github/workflows/ci-astra-dev-collection.yml b/.github/workflows/ci-astra-dev-collection.yml index b2b2c16c..891249f8 100644 --- a/.github/workflows/ci-astra-dev-collection.yml +++ b/.github/workflows/ci-astra-dev-collection.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Build with Maven run: | mvn install -Dmaven.test.skip=true @@ -26,12 +27,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -46,12 +48,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -66,12 +69,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: diff --git a/.github/workflows/ci-astra-dev-database.yml b/.github/workflows/ci-astra-dev-database.yml index 7ec07c9b..d1e507d5 100644 --- a/.github/workflows/ci-astra-dev-database.yml +++ b/.github/workflows/ci-astra-dev-database.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Build with Maven run: | mvn install -Dmaven.test.skip=true @@ -26,12 +27,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -46,12 +48,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -66,12 +69,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: diff --git a/.github/workflows/ci-astra-dev-databaseadmin.yml b/.github/workflows/ci-astra-dev-databaseadmin.yml index a7d5f8e5..ad1b6fba 100644 --- a/.github/workflows/ci-astra-dev-databaseadmin.yml +++ b/.github/workflows/ci-astra-dev-databaseadmin.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Build with Maven run: | mvn install -Dmaven.test.skip=true @@ -26,12 +27,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -46,12 +48,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -66,12 +69,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: diff --git a/.github/workflows/ci-astra-dev-devops.yml b/.github/workflows/ci-astra-dev-devops.yml index 1b3001a0..5bb63d87 100644 --- a/.github/workflows/ci-astra-dev-devops.yml +++ b/.github/workflows/ci-astra-dev-devops.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Build with Maven run: | mvn install -Dmaven.test.skip=true @@ -26,12 +27,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -46,12 +48,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -66,12 +69,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: diff --git a/.github/workflows/ci-astra-dev-new.yml b/.github/workflows/ci-astra-dev-new.yml new file mode 100644 index 00000000..717d0e90 --- /dev/null +++ b/.github/workflows/ci-astra-dev-new.yml @@ -0,0 +1,114 @@ +# This file will be deleted once its contents are moved into ci-astra-dev.yml or its equivalent +name: AstraDev NEW + +on: + #push: + # branches: [ main ] + #pull_request: + # branches: [ main ] + workflow_dispatch: + inputs: + java_distribution: + description: 'JDK distribution to use' + required: true + default: 'adopt' + options: ['adopt', 'temurin'] + java_version: + description: 'JDK version to use' + required: true + default: '11.0' + cache_pkg_mgr_name: + description: 'Cache package manager to be used' + required: true + default: 'maven' + skip_tests_on_build: + description: 'Skip tests during Maven build' + required: false + default: 'true' + +jobs: + setup: + runs-on: ubuntu-latest + steps: + - name: Checkout & Build + uses: ./.github/actions/checkout-and-build + + run_dev_tests: + needs: setup + runs-on: ubuntu-latest + strategy: + matrix: + include: + - cloud_provider: AWS + cloud_region: us-west-2 + - cloud_provider: GCP + cloud_region: europe-west4 +# - cloud_provider: GCP +# cloud_region: us-central1 + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ inputs.java_distribution }} + java-version: ${{ inputs.java_version }} + cache: ${{ inputs.cache_pkg_mgr_name }} + + - name: Run Maven Tests + env: + ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} + ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }} + ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }} + run: | + cd astra-db-java + mvn test -Dtest=com.datastax.astra.test.integration.dev.*Test + + run_vectorize_tests: + needs: setup + runs-on: ubuntu-latest + strategy: + matrix: + include: + - cloud_provider: AWS + cloud_region: us-west-2 + - cloud_provider: GCP + cloud_region: europe-west4 + embedding_provider: + - name: openai + key: ${{ secrets.OPENAI_API_KEY }} + - name: azureOpenAI + key: ${{ secrets.AZURE_OPENAI_API_KEY }} + - name: huggingface + key: ${{ secrets.HF_API_KEY }} + - name: mistral + key: ${{ secrets.MISTRAL_API_KEY }} + - name: voyageAI + key: ${{ secrets.VOYAGE_API_KEY }} + - name: upstageAI + key: ${{ secrets.UPSTAGE_API_KEY }} + - name: jinaAI + key: ${{ secrets.JINA_API_KEY }} + - name: nvidia + key: 'nvidia' # Not used + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: '11.0' + cache: 'maven' + + - name: Run Maven Tests + env: + ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} + ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }} + ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }} + EMBEDDING_PROVIDER: ${{ matrix.embedding_provider.name }} + EMBEDDING_API_KEY: ${{ matrix.embedding_provider.key }} + run: | + cd astra-db-java + mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeEmbeddingApiKeyITTest diff --git a/.github/workflows/ci-astra-dev-vectorize-aws-bedrock.yml b/.github/workflows/ci-astra-dev-vectorize-aws-bedrock.yml index 721a56d0..c4a8e875 100644 --- a/.github/workflows/ci-astra-dev-vectorize-aws-bedrock.yml +++ b/.github/workflows/ci-astra-dev-vectorize-aws-bedrock.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Build with Maven run: | mvn install -Dmaven.test.skip=true @@ -27,12 +28,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -50,12 +52,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -74,12 +77,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} diff --git a/.github/workflows/ci-astra-dev-vectorize-hf-dedicated.yml b/.github/workflows/ci-astra-dev-vectorize-hf-dedicated.yml index 1c985770..d4953eef 100644 --- a/.github/workflows/ci-astra-dev-vectorize-hf-dedicated.yml +++ b/.github/workflows/ci-astra-dev-vectorize-hf-dedicated.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Build with Maven run: | mvn install -Dmaven.test.skip=true @@ -27,12 +28,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -53,12 +55,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -79,12 +82,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} diff --git a/.github/workflows/ci-astra-dev.yml b/.github/workflows/ci-astra-dev.yml index 6d375b11..df6c8847 100644 --- a/.github/workflows/ci-astra-dev.yml +++ b/.github/workflows/ci-astra-dev.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Build with Maven run: | mvn install -Dmaven.test.skip=true @@ -27,12 +28,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -47,12 +49,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Run test for DEV env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -67,12 +70,13 @@ jobs: # runs-on: ubuntu-latest # steps: # - name: Checkout repository -# uses: actions/checkout@v2 +# uses: actions/checkout@v4 # - name: Set up JDK -# uses: actions/setup-java@v2 +# uses: actions/setup-java@v4 # with: # distribution: 'adopt' # java-version: 11 +# cache: 'maven' # # - name: Run test for DEV # env: @@ -88,12 +92,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -109,12 +114,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -130,12 +136,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -153,12 +160,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -174,12 +182,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -195,12 +204,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -218,12 +228,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -241,12 +252,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -267,12 +279,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -288,12 +301,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -309,12 +323,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -331,12 +346,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -352,12 +368,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -373,12 +390,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -397,12 +415,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} @@ -418,12 +437,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} diff --git a/.github/workflows/ci-astra-devops.yaml b/.github/workflows/ci-astra-devops.yaml new file mode 100644 index 00000000..3974ae31 --- /dev/null +++ b/.github/workflows/ci-astra-devops.yaml @@ -0,0 +1,90 @@ +name: Astra | DevOps API + +on: + #push: + # branches: [ main ] + #pull_request: + # branches: [ main ] + workflow_dispatch: + inputs: + java_distribution: + description: 'JDK distribution to use' + required: true + default: 'adopt' + options: ['adopt', 'temurin'] + java_version: + description: 'JDK version to use' + required: true + default: '11.0' + cache_pkg_mgr_name: + description: 'Cache package manager to be used' + required: true + default: 'maven' + skip_tests_on_build: + description: 'Skip tests during Maven build' + required: false + default: 'true' + +jobs: + BUILD: + runs-on: ubuntu-latest + steps: + - name: Checkout & Build + uses: ./.github/actions/checkout-and-build + run_dev_tests: + needs: BUILD + runs-on: ubuntu-latest + strategy: + matrix: + # We had to do it this way because same regions aren't testing in various Astra envs. + include: + - cloud_provider: 'AWS' + cloud_region: 'us-west-2' + astra_environment: 'DEV' + - cloud_provider: 'AWS' + cloud_region: 'eu-west-1' + astra_environment: 'DEV' + - cloud_provider: 'AWS' + cloud_region: 'eu-west-1' + astra_environment: 'PROD' + - cloud_provider: 'GCP' + cloud_region: 'europe-west4' + astra_environment: 'DEV' + - cloud_provider: 'GCP' + cloud_region: 'us-east1' + astra_environment: 'PROD' + - cloud_provider: 'GCP' + cloud_region: 'us-central1' + astra_environment: 'DEV' + - cloud_provider: 'AZURE' + cloud_region: 'westus3' + astra_environment: 'PROD' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ inputs.java_distribution }} + java-version: ${{ inputs.java_version }} + cache: ${{ inputs.cache_pkg_mgr_name }} + + - name: Run Maven Tests in ${{ inputs.astra_environment }} environment + if: ${{ matrix.astra_environment == 'PROD' }} + env: + ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }} + ASTRA_CLOUD_PROVIDER: ${{ matrix.cloud_provider }} + ASTRA_CLOUD_REGION: ${{ matrix.cloud_region }} + run: | + cd astra-db-java + mvn test -Dtest=com.datastax.astra.test.integration.prod.AstraProdDevopsITTest + + - name: Run Maven Tests in ${{ matrix.astra_environment }} environment + if: ${{ matrix.astra_environment == 'DEV' }} + env: + ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} + ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }} + ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }} + run: | + cd astra-db-java + mvn test -Dtest=com.datastax.astra.test.integration.dev.AstraDevDevopsITTest \ No newline at end of file diff --git a/.github/workflows/ci-astra-prod-devops.yml b/.github/workflows/ci-astra-prod-devops.yml index ec74e4c8..2f43e24e 100644 --- a/.github/workflows/ci-astra-prod-devops.yml +++ b/.github/workflows/ci-astra-prod-devops.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Build with Maven run: | mvn install -Dmaven.test.skip=true @@ -26,12 +27,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }} @@ -44,12 +46,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }} @@ -63,12 +66,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 + cache: 'maven' - name: Maven Test env: ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }} diff --git a/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml b/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml new file mode 100644 index 00000000..b061544a --- /dev/null +++ b/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml @@ -0,0 +1,96 @@ +name: Astra Vectorize | Bedrock/HF Dedicated + +on: + #push: + # branches: [ main ] + #pull_request: + # branches: [ main ] + workflow_dispatch: + inputs: + embedding_provider_to_test: + description: 'Embedding provider for tests to run' + required: true + default: 'bedrock' + options: + - 'bedrock' + - 'huggingfaceDedicated' + java_distribution: + description: 'JDK distribution to use' + required: true + default: 'adopt' + options: ['adopt', 'temurin'] + java_version: + description: 'JDK version to use' + required: true + default: '11.0' + cache_pkg_mgr_name: + description: 'Cache package manager to be used' + required: true + default: 'maven' + skip_tests_on_build: + description: 'Skip tests during Maven build' + required: false + default: 'true' + +jobs: + BUILD: + runs-on: ubuntu-latest + steps: + - name: Checkout & Build + uses: ./.github/actions/checkout-and-build + + run_vectorize_tests: + needs: BUILD + runs-on: ubuntu-latest + strategy: + matrix: + # We had to do it this way because same regions aren't testing in various Astra envs. + include: + - cloud_provider: 'AWS' + cloud_region: 'us-west-2' + astra_environment: 'DEV' + - cloud_provider: 'GCP' + cloud_region: 'europe-west4' + astra_environment: 'DEV' + - cloud_provider: 'GCP' + cloud_region: 'us-central1' + astra_environment: 'DEV' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ inputs.java_distribution }} + java-version: ${{ inputs.java_version }} + cache: ${{ inputs.cache_pkg_mgr_name }} + + - name: Maven Test for ${{ inputs.embedding_provider_to_test }} on ${{ matrix.cloud_provider }} - ${{ matrix.cloud_region }} [Astra DEV]" + if: ${{ matrix.astra_environment == 'DEV' && inputs.embedding_provider_to_test == 'bedrock' }} + env: + ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} + ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }} + ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }} + EMBEDDING_PROVIDER: bedrock + BEDROCK_HEADER_AWS_ACCESS_ID: ${{ secrets.BEDROCK_HEADER_AWS_ACCESS_ID }} + BEDROCK_HEADER_AWS_SECRET_ID: ${{ secrets.BEDROCK_HEADER_AWS_SECRET_ID }} + BEDROCK_REGION: ${{ vars.BEDROCK_REGION }} + run: | + cd astra-db-java + mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeAwsBedRockITTest + + - name: Maven Test for ${{ inputs.embedding_provider_to_test }} on ${{ matrix.cloud_provider }} - ${{ matrix.cloud_region }} [Astra DEV]" + if: ${{ matrix.astra_environment == 'DEV' && inputs.embedding_provider_to_test == 'huggingfaceDedicated' }} + env: + ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} + ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }} + ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }} + EMBEDDING_PROVIDER: huggingfaceDedicated + EMBEDDING_API_KEY: ${{ secrets.HUGGINGFACEDED_API_KEY }} + HUGGINGFACEDED_DIMENSION: ${{ vars.HUGGINGFACEDED_DIMENSION }} + HUGGINGFACEDED_ENDPOINTNAME: ${{ vars.HUGGINGFACEDED_ENDPOINTNAME }} + HUGGINGFACEDED_REGIONNAME: ${{ vars.HUGGINGFACEDED_REGIONNAME }} + HUGGINGFACEDED_CLOUDNAME: ${{ vars.HUGGINGFACEDED_CLOUDNAME }} + run: | + cd astra-db-java + mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeHuggingFaceDedicatedITTest From babffefa7d0149019dc5a9675bfa14b36a546ea2 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Thu, 31 Oct 2024 13:09:25 -0400 Subject: [PATCH 6/9] Update workflow to use the action --- .github/workflows/ci-astra-col-db-dbadmin.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-astra-col-db-dbadmin.yaml b/.github/workflows/ci-astra-col-db-dbadmin.yaml index 7c431610..35b8fdc3 100644 --- a/.github/workflows/ci-astra-col-db-dbadmin.yaml +++ b/.github/workflows/ci-astra-col-db-dbadmin.yaml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout & Build - uses: ./.github/actions/build-with-maven + uses: ./.github/actions/checkout-and-build run_dev_tests: needs: BUILD From 8f63f34526d9e3ec13cf5e74b54a84a3d8c67d6c Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Fri, 8 Nov 2024 09:19:42 -0500 Subject: [PATCH 7/9] Copy over GHA action workflow changes over from main to 1.x --- .github/actions/checkout-and-build/action.yml | 1 + .github/dependabot.yml | 13 ++++++ .../workflows/ci-astra-col-db-dbadmin.yaml | 4 ++ .github/workflows/ci-astra-dev-new.yml | 44 ++++++++++--------- .github/workflows/ci-astra-devops.yaml | 2 + .../ci-astra-vectorize-bedrock-hf.yaml | 4 ++ pom.xml | 6 +++ 7 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/actions/checkout-and-build/action.yml b/.github/actions/checkout-and-build/action.yml index a7a2a7d4..a15d31b3 100644 --- a/.github/actions/checkout-and-build/action.yml +++ b/.github/actions/checkout-and-build/action.yml @@ -31,5 +31,6 @@ runs: cache: ${{ inputs.cache_pkg_mgr_name}} - name: Build with Maven + shell: bash run: | mvn install -Dmaven.test.skip=${{ inputs.skip_tests_on_build }} \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..25688a19 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +# Set update schedule for GitHub Actions + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "monthly" diff --git a/.github/workflows/ci-astra-col-db-dbadmin.yaml b/.github/workflows/ci-astra-col-db-dbadmin.yaml index 35b8fdc3..ab32f5f6 100644 --- a/.github/workflows/ci-astra-col-db-dbadmin.yaml +++ b/.github/workflows/ci-astra-col-db-dbadmin.yaml @@ -11,6 +11,7 @@ on: description: 'JDK distribution to use' required: true default: 'adopt' + type: choice options: ['adopt', 'temurin'] java_version: description: 'JDK version to use' @@ -28,6 +29,7 @@ on: description: 'Test to run' required: true default: 'AstraDevCollectionITTest' + type: choice options: - 'AstraDevCollectionITTest' - 'AstraDevDatabaseITTest' @@ -40,6 +42,8 @@ jobs: BUILD: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Checkout & Build uses: ./.github/actions/checkout-and-build diff --git a/.github/workflows/ci-astra-dev-new.yml b/.github/workflows/ci-astra-dev-new.yml index 717d0e90..19c065ae 100644 --- a/.github/workflows/ci-astra-dev-new.yml +++ b/.github/workflows/ci-astra-dev-new.yml @@ -12,6 +12,7 @@ on: description: 'JDK distribution to use' required: true default: 'adopt' + type: choice options: ['adopt', 'temurin'] java_version: description: 'JDK version to use' @@ -27,14 +28,16 @@ on: default: 'true' jobs: - setup: + BUILD: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Checkout & Build uses: ./.github/actions/checkout-and-build run_dev_tests: - needs: setup + needs: BUILD runs-on: ubuntu-latest strategy: matrix: @@ -74,23 +77,22 @@ jobs: cloud_region: us-west-2 - cloud_provider: GCP cloud_region: europe-west4 - embedding_provider: - - name: openai - key: ${{ secrets.OPENAI_API_KEY }} - - name: azureOpenAI - key: ${{ secrets.AZURE_OPENAI_API_KEY }} - - name: huggingface - key: ${{ secrets.HF_API_KEY }} - - name: mistral - key: ${{ secrets.MISTRAL_API_KEY }} - - name: voyageAI - key: ${{ secrets.VOYAGE_API_KEY }} - - name: upstageAI - key: ${{ secrets.UPSTAGE_API_KEY }} - - name: jinaAI - key: ${{ secrets.JINA_API_KEY }} - - name: nvidia - key: 'nvidia' # Not used + - embedding_provider: openai + key_name: OPENAI_API_KEY + - embedding_provider: azureOpenAI + key_name: AZURE_OPENAI_API_KEY + - embedding_provider: huggingface + key_name: HF_API_KEY + - embedding_provider: mistral + key_name: MISTRAL_API_KEY + - embedding_provider: voyageAI + key_name: VOYAGE_API_KEY + - embedding_provider: upstageAI + key_name: UPSTAGE_API_KEY + - embedding_provider: jinaAI + key_name: JINA_API_KEY + - embedding_provider: nvidia + key_name: 'nvidia' # Not used steps: - name: Checkout repository @@ -107,8 +109,8 @@ jobs: ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }} ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }} - EMBEDDING_PROVIDER: ${{ matrix.embedding_provider.name }} - EMBEDDING_API_KEY: ${{ matrix.embedding_provider.key }} + EMBEDDING_PROVIDER: ${{ matrix.embedding_provider }} + EMBEDDING_API_KEY: ${{ secrets[matrix.key_name] }} run: | cd astra-db-java mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeEmbeddingApiKeyITTest diff --git a/.github/workflows/ci-astra-devops.yaml b/.github/workflows/ci-astra-devops.yaml index 3974ae31..afecceec 100644 --- a/.github/workflows/ci-astra-devops.yaml +++ b/.github/workflows/ci-astra-devops.yaml @@ -29,6 +29,8 @@ jobs: BUILD: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Checkout & Build uses: ./.github/actions/checkout-and-build run_dev_tests: diff --git a/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml b/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml index b061544a..70af5475 100644 --- a/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml +++ b/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml @@ -11,6 +11,7 @@ on: description: 'Embedding provider for tests to run' required: true default: 'bedrock' + type: choice options: - 'bedrock' - 'huggingfaceDedicated' @@ -18,6 +19,7 @@ on: description: 'JDK distribution to use' required: true default: 'adopt' + type: choice options: ['adopt', 'temurin'] java_version: description: 'JDK version to use' @@ -36,6 +38,8 @@ jobs: BUILD: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Checkout & Build uses: ./.github/actions/checkout-and-build diff --git a/pom.xml b/pom.xml index 294daa60..c7a7b66f 100644 --- a/pom.xml +++ b/pom.xml @@ -339,6 +339,12 @@ cedrick.lunven@gmail.com https://github.com/clun + + msmygit + Madhavan Sridharan + madhavan_5k@yahoo.com + https://github.com/msmygit + From fa46fda8851a18243ae0c4ade4d9395f67a8ebed Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Fri, 8 Nov 2024 10:22:59 -0500 Subject: [PATCH 8/9] remove docker from dependabot --- .github/dependabot.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 25688a19..b1f8a9b6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,7 +7,3 @@ updates: schedule: interval: "monthly" - - package-ecosystem: "docker" - directory: "/" - schedule: - interval: "monthly" From ada9b83d0c7ef0778f476fe80fc0baa76d55afe9 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Thu, 21 Nov 2024 18:46:43 -0500 Subject: [PATCH 9/9] Update dependent job name --- .github/workflows/ci-astra-dev-new.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-astra-dev-new.yml b/.github/workflows/ci-astra-dev-new.yml index 19c065ae..53bafe18 100644 --- a/.github/workflows/ci-astra-dev-new.yml +++ b/.github/workflows/ci-astra-dev-new.yml @@ -68,7 +68,7 @@ jobs: mvn test -Dtest=com.datastax.astra.test.integration.dev.*Test run_vectorize_tests: - needs: setup + needs: BUILD runs-on: ubuntu-latest strategy: matrix: pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy