From 07ed093a0eb567824d6aede06656959858fe23d7 Mon Sep 17 00:00:00 2001 From: toptobes Date: Wed, 18 Feb 2026 19:44:11 -0800 Subject: [PATCH 01/10] basic docs compilation tests --- .github/workflows/ci-docs-compile-tests.yml | 32 +++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/ci-docs-compile-tests.yml diff --git a/.github/workflows/ci-docs-compile-tests.yml b/.github/workflows/ci-docs-compile-tests.yml new file mode 100644 index 0000000..95edef6 --- /dev/null +++ b/.github/workflows/ci-docs-compile-tests.yml @@ -0,0 +1,32 @@ +name: Compile against documentation examples + +on: + workflow_call: + workflow_dispatch: + pull_request: # temporary until it's merged + branches: [ KG-ci-additions ] + push: + branches: [ KG-ci-additions ] + +jobs: + test-compilation: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v6 + + - name: Build client + uses: ./.github/actions/checkout-and-build + + - name: Get built JAR path + id: jar + run: | + JAR_PATH=$(ls target/astra-db-java-*.jar) + echo "jar_path=$JAR_PATH" >> $GITHUB_OUTPUT + + - name: Run compilation tests + uses: datastax/astra-client-docs-tests/.github/actions/test-compilation@master + with: + clients: 'java' + args: -A java="$${{ steps.jar.outputs.jar_path }}" + docs-repo-token: ${{ secrets.DOC_GITHUB_PAT_CROSS_ORG }} From 16f943c0d64eba5d83b2909cf5b71396e20d2345 Mon Sep 17 00:00:00 2001 From: toptobes Date: Wed, 18 Feb 2026 19:51:29 -0800 Subject: [PATCH 02/10] try fix gpg issue? --- .github/actions/checkout-and-build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/checkout-and-build/action.yml b/.github/actions/checkout-and-build/action.yml index a15d31b..0a0c191 100644 --- a/.github/actions/checkout-and-build/action.yml +++ b/.github/actions/checkout-and-build/action.yml @@ -33,4 +33,4 @@ runs: - name: Build with Maven shell: bash run: | - mvn install -Dmaven.test.skip=${{ inputs.skip_tests_on_build }} \ No newline at end of file + mvn install -Dmaven.test.skip=${{ inputs.skip_tests_on_build }} -Dgpg.skip \ No newline at end of file From 6df15481cec2bf81619a8c29331bd8960c69f640 Mon Sep 17 00:00:00 2001 From: toptobes Date: Thu, 19 Feb 2026 00:13:25 -0800 Subject: [PATCH 03/10] well it works a bit. I think it just needs to be updated for v2.1.5 --- .github/workflows/ci-docs-compile-tests.yml | 25 ++++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-docs-compile-tests.yml b/.github/workflows/ci-docs-compile-tests.yml index 95edef6..f8195e3 100644 --- a/.github/workflows/ci-docs-compile-tests.yml +++ b/.github/workflows/ci-docs-compile-tests.yml @@ -15,18 +15,31 @@ jobs: - name: Checkout repository uses: actions/checkout@v6 - - name: Build client - uses: ./.github/actions/checkout-and-build + - name: Install maven + shell: bash + run: | + sudo apt update + sudo apt install maven -y + + - name: Set up JDK 17 + uses: actions/setup-java@v5 + with: + distribution: adopt + java-version: 17 + cache: maven - - name: Get built JAR path - id: jar + - name: Build with Maven + shell: bash + id: build run: | - JAR_PATH=$(ls target/astra-db-java-*.jar) + mvn install -pl astra-db-java -am -Dmaven.test.skip=true -Dgpg.skip + VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + JAR_PATH="$HOME/.m2/repository/com/datastax/astra/astra-db-java/$VERSION/astra-db-java-$VERSION.jar" echo "jar_path=$JAR_PATH" >> $GITHUB_OUTPUT - name: Run compilation tests uses: datastax/astra-client-docs-tests/.github/actions/test-compilation@master with: clients: 'java' - args: -A java="$${{ steps.jar.outputs.jar_path }}" + args: -A java='files(\"${{ steps.build.outputs.jar_path }}\")' docs-repo-token: ${{ secrets.DOC_GITHUB_PAT_CROSS_ORG }} From 0cd1ccec4adeb341f5801cf79bbd6dae9f19d176 Mon Sep 17 00:00:00 2001 From: toptobes Date: Sat, 21 Feb 2026 17:02:27 -0800 Subject: [PATCH 04/10] should actually work now --- .github/workflows/ci-docs-compile-tests.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-docs-compile-tests.yml b/.github/workflows/ci-docs-compile-tests.yml index f8195e3..15fcc04 100644 --- a/.github/workflows/ci-docs-compile-tests.yml +++ b/.github/workflows/ci-docs-compile-tests.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: adopt - java-version: 17 + java-version: 21 cache: maven - name: Build with Maven @@ -34,12 +34,11 @@ jobs: run: | mvn install -pl astra-db-java -am -Dmaven.test.skip=true -Dgpg.skip VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - JAR_PATH="$HOME/.m2/repository/com/datastax/astra/astra-db-java/$VERSION/astra-db-java-$VERSION.jar" - echo "jar_path=$JAR_PATH" >> $GITHUB_OUTPUT + echo "version=$VERSION" >> $GITHUB_OUTPUT - name: Run compilation tests uses: datastax/astra-client-docs-tests/.github/actions/test-compilation@master with: clients: 'java' - args: -A java='files(\"${{ steps.build.outputs.jar_path }}\")' + args: -A java='\"com.datastax.astra:astra-db-java:${{ steps.build.outputs.version }}\"' docs-repo-token: ${{ secrets.DOC_GITHUB_PAT_CROSS_ORG }} From 2cb076c57f1d1f3648bf2b41be88fc49813b686b Mon Sep 17 00:00:00 2001 From: toptobes Date: Tue, 3 Mar 2026 00:22:12 -0600 Subject: [PATCH 05/10] start overhauling ci --- ...pile-tests.yml => _docs-compile-tests.yml} | 20 +++---- .github/workflows/_hcd-integration-tests.yml | 42 ++++++++++++++ .github/workflows/_unit-tests.yml | 35 ++++++++++++ .../{ => legacy}/ci-astra-col-db-dbadmin.yaml | 0 .../{ => legacy}/ci-astra-dev-collection.yml | 0 .../{ => legacy}/ci-astra-dev-database.yml | 0 .../ci-astra-dev-databaseadmin.yml | 0 .../{ => legacy}/ci-astra-dev-devops.yml | 0 .../{ => legacy}/ci-astra-dev-new.yml | 0 .../ci-astra-dev-vectorize-aws-bedrock.yml | 0 .../ci-astra-dev-vectorize-hf-dedicated.yml | 0 .../workflows/{ => legacy}/ci-astra-dev.yml | 0 .../{ => legacy}/ci-astra-devops.yaml | 0 .../{ => legacy}/ci-astra-prod-devops.yml | 0 .../ci-astra-vectorize-bedrock-hf.yaml | 0 .github/workflows/tests.yml | 48 ++++++++++++++++ .gitignore | 3 +- .../src/test/resources/docker-compose-hcd.yml | 56 +++++++++++++++++++ 18 files changed, 190 insertions(+), 14 deletions(-) rename .github/workflows/{ci-docs-compile-tests.yml => _docs-compile-tests.yml} (73%) create mode 100644 .github/workflows/_hcd-integration-tests.yml create mode 100644 .github/workflows/_unit-tests.yml rename .github/workflows/{ => legacy}/ci-astra-col-db-dbadmin.yaml (100%) rename .github/workflows/{ => legacy}/ci-astra-dev-collection.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-dev-database.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-dev-databaseadmin.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-dev-devops.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-dev-new.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-dev-vectorize-aws-bedrock.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-dev-vectorize-hf-dedicated.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-dev.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-devops.yaml (100%) rename .github/workflows/{ => legacy}/ci-astra-prod-devops.yml (100%) rename .github/workflows/{ => legacy}/ci-astra-vectorize-bedrock-hf.yaml (100%) create mode 100644 .github/workflows/tests.yml create mode 100644 astra-db-java/src/test/resources/docker-compose-hcd.yml diff --git a/.github/workflows/ci-docs-compile-tests.yml b/.github/workflows/_docs-compile-tests.yml similarity index 73% rename from .github/workflows/ci-docs-compile-tests.yml rename to .github/workflows/_docs-compile-tests.yml index 15fcc04..8ce700e 100644 --- a/.github/workflows/ci-docs-compile-tests.yml +++ b/.github/workflows/_docs-compile-tests.yml @@ -3,10 +3,10 @@ name: Compile against documentation examples on: workflow_call: workflow_dispatch: - pull_request: # temporary until it's merged - branches: [ KG-ci-additions ] - push: - branches: [ KG-ci-additions ] +# pull_request: # temporary until it's merged +# branches: [ KG-ci-additions ] +# push: +# branches: [ KG-ci-additions ] jobs: test-compilation: @@ -15,18 +15,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v6 - - name: Install maven - shell: bash - run: | - sudo apt update - sudo apt install maven -y - - name: Set up JDK 17 uses: actions/setup-java@v5 with: - distribution: adopt - java-version: 21 - cache: maven + java-version: 17 + distribution: 'temurin' + cache: 'maven' - name: Build with Maven shell: bash diff --git a/.github/workflows/_hcd-integration-tests.yml b/.github/workflows/_hcd-integration-tests.yml new file mode 100644 index 0000000..30107b2 --- /dev/null +++ b/.github/workflows/_hcd-integration-tests.yml @@ -0,0 +1,42 @@ +name: Run integration tests against HCD + +on: + workflow_call: + workflow_dispatch: + pull_request: # temporary until it's merged + branches: [ KG-ci-additions ] + push: + branches: [ KG-ci-additions ] + +permissions: + id-token: write + +jobs: + test-integration-hcd: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v6 + + - name: Setup Java 17 + uses: actions/setup-java@v5 + with: + java-version: '17' + distribution: 'temurin' + cache: 'maven' + + - name: Configure AWS credentials from OIDC + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: arn:aws:iam::559669398656:role/astra-db-java-ecr-ro-user + aws-region: us-west-2 + + - name: Login to Amazon ECR + uses: aws-actions/amazon-ecr-login@v2 + + - name: Start HCD and Data API + run: docker-compose -f docker-compose-hcd.yml up -d --wait + working-directory: ${{ github.workspace }}/astra-db-java/src/test/resources + + - name: Run integration tests + run: mvn clean verify -pl astra-db-java -Plocal diff --git a/.github/workflows/_unit-tests.yml b/.github/workflows/_unit-tests.yml new file mode 100644 index 0000000..3636b71 --- /dev/null +++ b/.github/workflows/_unit-tests.yml @@ -0,0 +1,35 @@ +name: Run unit tests + +on: + workflow_call: + inputs: + java_versions: + type: string + description: 'Comma-separated list of Java versions e.g. "17","21"' + required: true + workflow_dispatch: + inputs: + java_versions: + description: 'Comma-separated list of Java versions e.g. "17","21"' + default: '"17"' + required: false + +jobs: + unit-tests: + runs-on: ubuntu-latest + strategy: + matrix: + java-version: ${{ fromJSON(format('[{0}]', inputs.java_versions || '"17"')) }} + steps: + - name: Checkout code + uses: actions/checkout@v6 + + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v5 + with: + java-version: ${{ matrix.java-version }} + distribution: 'temurin' + cache: 'maven' + + - name: Run unit tests + run: mvn clean test -Dtest='!**/*IT' -Dtest.skipped=false -pl astra-db-java -B diff --git a/.github/workflows/ci-astra-col-db-dbadmin.yaml b/.github/workflows/legacy/ci-astra-col-db-dbadmin.yaml similarity index 100% rename from .github/workflows/ci-astra-col-db-dbadmin.yaml rename to .github/workflows/legacy/ci-astra-col-db-dbadmin.yaml diff --git a/.github/workflows/ci-astra-dev-collection.yml b/.github/workflows/legacy/ci-astra-dev-collection.yml similarity index 100% rename from .github/workflows/ci-astra-dev-collection.yml rename to .github/workflows/legacy/ci-astra-dev-collection.yml diff --git a/.github/workflows/ci-astra-dev-database.yml b/.github/workflows/legacy/ci-astra-dev-database.yml similarity index 100% rename from .github/workflows/ci-astra-dev-database.yml rename to .github/workflows/legacy/ci-astra-dev-database.yml diff --git a/.github/workflows/ci-astra-dev-databaseadmin.yml b/.github/workflows/legacy/ci-astra-dev-databaseadmin.yml similarity index 100% rename from .github/workflows/ci-astra-dev-databaseadmin.yml rename to .github/workflows/legacy/ci-astra-dev-databaseadmin.yml diff --git a/.github/workflows/ci-astra-dev-devops.yml b/.github/workflows/legacy/ci-astra-dev-devops.yml similarity index 100% rename from .github/workflows/ci-astra-dev-devops.yml rename to .github/workflows/legacy/ci-astra-dev-devops.yml diff --git a/.github/workflows/ci-astra-dev-new.yml b/.github/workflows/legacy/ci-astra-dev-new.yml similarity index 100% rename from .github/workflows/ci-astra-dev-new.yml rename to .github/workflows/legacy/ci-astra-dev-new.yml diff --git a/.github/workflows/ci-astra-dev-vectorize-aws-bedrock.yml b/.github/workflows/legacy/ci-astra-dev-vectorize-aws-bedrock.yml similarity index 100% rename from .github/workflows/ci-astra-dev-vectorize-aws-bedrock.yml rename to .github/workflows/legacy/ci-astra-dev-vectorize-aws-bedrock.yml diff --git a/.github/workflows/ci-astra-dev-vectorize-hf-dedicated.yml b/.github/workflows/legacy/ci-astra-dev-vectorize-hf-dedicated.yml similarity index 100% rename from .github/workflows/ci-astra-dev-vectorize-hf-dedicated.yml rename to .github/workflows/legacy/ci-astra-dev-vectorize-hf-dedicated.yml diff --git a/.github/workflows/ci-astra-dev.yml b/.github/workflows/legacy/ci-astra-dev.yml similarity index 100% rename from .github/workflows/ci-astra-dev.yml rename to .github/workflows/legacy/ci-astra-dev.yml diff --git a/.github/workflows/ci-astra-devops.yaml b/.github/workflows/legacy/ci-astra-devops.yaml similarity index 100% rename from .github/workflows/ci-astra-devops.yaml rename to .github/workflows/legacy/ci-astra-devops.yaml diff --git a/.github/workflows/ci-astra-prod-devops.yml b/.github/workflows/legacy/ci-astra-prod-devops.yml similarity index 100% rename from .github/workflows/ci-astra-prod-devops.yml rename to .github/workflows/legacy/ci-astra-prod-devops.yml diff --git a/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml b/.github/workflows/legacy/ci-astra-vectorize-bedrock-hf.yaml similarity index 100% rename from .github/workflows/ci-astra-vectorize-bedrock-hf.yaml rename to .github/workflows/legacy/ci-astra-vectorize-bedrock-hf.yaml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..5bd1a4a --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,48 @@ +name: Tests + +on: + merge_group: + pull_request: + +# alias act='act --container-architecture linux/amd64 -P ubuntu-latest=quay.io/jamezp/act-maven' + +jobs: + run-unit-tests: + name: Run unit tests + uses: ./.github/workflows/_unit-tests.yml +# with: +# java_versions: ${{ github.event_name == 'merge_group' && '"17","21"' || '"17"' }} + + run-docs-compilation-tests: + name: Run docs compilation tests + needs: [run-unit-tests] + if: github.event_name == 'merge_group' + uses: ./.github/workflows/_docs-compile-tests.yml + secrets: inherit + + run-hcd-integration-tests: + name: Run HCD integration tests + needs: [run-unit-tests] + if: github.event_name == 'merge_group' + uses: ./.github/workflows/_hcd-integration-tests.yml + secrets: inherit + + can-enqueue: + name: Can enqueue + needs: [run-unit-tests] + if: always() && github.event_name != 'merge_group' + runs-on: ubuntu-latest + steps: + - name: Check outcomes + run: | + echo '${{ toJSON(needs) }}' | jq -e 'to_entries | map(.value.result == "success" or .value.result == "skipped") | all' + + can-merge: + name: Can merge + needs: [run-unit-tests, run-docs-compilation-tests, run-hcd-integration-tests] + if: always() && github.event_name == 'merge_group' + runs-on: ubuntu-latest + steps: + - name: Check outcomes + run: | + echo '${{ toJSON(needs) }}' | jq -e 'to_entries | map(.value.result == "success" or .value.result == "skipped") | all' diff --git a/.gitignore b/.gitignore index f6250b8..c4f6c06 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,5 @@ test-config-astra.properties test-config-embedding-providers.properties release.properties -pom.xml.releaseBackup \ No newline at end of file +pom.xml.releaseBackup +.bob diff --git a/astra-db-java/src/test/resources/docker-compose-hcd.yml b/astra-db-java/src/test/resources/docker-compose-hcd.yml new file mode 100644 index 0000000..48b38a3 --- /dev/null +++ b/astra-db-java/src/test/resources/docker-compose-hcd.yml @@ -0,0 +1,56 @@ +version: '2' + +services: + hcd: + image: 559669398656.dkr.ecr.us-west-2.amazonaws.com/engops-shared/hcd/prod/hcd:1.2.3 + networks: + - stargate + mem_limit: 2G + environment: + - MAX_HEAP_SIZE=1536M + - CLUSTER_NAME=hcd-1.2.3-cluster + - DS_LICENSE=accept + - HCD_AUTO_CONF_OFF=xcassandra.yaml + - JVM_EXTRA_OPTS=-Dcassandra.sai.latest.version=ec + volumes: + - ./cassandra-hcd.yaml:/opt/hcd/resources/cassandra/conf/xcassandra.yaml:rw + ports: + - "9042:9042" + healthcheck: + test: [ "CMD-SHELL", "cqlsh -u cassandra -p cassandra -e 'describe keyspaces'" ] + interval: 15s + timeout: 10s + retries: 20 + + data-api: + image: stargateio/data-api:v1 + depends_on: + hcd: + condition: service_healthy + networks: + - stargate + ports: + - "8181:8181" + mem_limit: 2G + environment: + - JAVA_MAX_MEM_RATIO=75 + - JAVA_INITIAL_MEM_RATIO=50 + - STARGATE_DATA_STORE_IGNORE_BRIDGE=true + - GC_CONTAINER_OPTIONS=-XX:+UseG1GC + - STARGATE_JSONAPI_OPERATIONS_DATABASE_CONFIG_CASSANDRA_END_POINTS=hcd + - STARGATE_JSONAPI_OPERATIONS_DATABASE_CONFIG_LOCAL_DATACENTER=dc1 + - STARGATE_DATABASE_LIMITS_MAX_COLLECTIONS=50 + - QUARKUS_HTTP_ACCESS_LOG_ENABLED=FALSE + - QUARKUS_LOG_LEVEL=INFO + - STARGATE_JSONAPI_OPERATIONS_VECTORIZE_ENABLED=true + - STARGATE_FEATURE_FLAGS_TABLES=true + - STARGATE_FEATURE_FLAGS_RERANKING=true + - JAVA_OPTS_APPEND=-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager + healthcheck: + test: curl -f http://localhost:8181/stargate/health || exit 1 + interval: 5s + timeout: 10s + retries: 10 + +networks: + stargate: From e8e5b7d31cbe84cfd7e78524fe94db5d4aaaf0bb Mon Sep 17 00:00:00 2001 From: toptobes Date: Tue, 3 Mar 2026 10:42:29 -0600 Subject: [PATCH 06/10] update aws iam role --- .github/workflows/_hcd-integration-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_hcd-integration-tests.yml b/.github/workflows/_hcd-integration-tests.yml index 30107b2..eb43da4 100644 --- a/.github/workflows/_hcd-integration-tests.yml +++ b/.github/workflows/_hcd-integration-tests.yml @@ -28,14 +28,14 @@ jobs: - name: Configure AWS credentials from OIDC uses: aws-actions/configure-aws-credentials@v4 with: - role-to-assume: arn:aws:iam::559669398656:role/astra-db-java-ecr-ro-user + role-to-assume: arn:aws:iam::559669398656:role/data-api-clients-ecr-ro-user aws-region: us-west-2 - name: Login to Amazon ECR uses: aws-actions/amazon-ecr-login@v2 - name: Start HCD and Data API - run: docker-compose -f docker-compose-hcd.yml up -d --wait + run: docker compose -f docker-compose-hcd.yml up -d --wait working-directory: ${{ github.workspace }}/astra-db-java/src/test/resources - name: Run integration tests From 814bef82781dcec9ef5c043913daec3ac49206f8 Mon Sep 17 00:00:00 2001 From: toptobes Date: Tue, 3 Mar 2026 10:57:04 -0600 Subject: [PATCH 07/10] maybe now? --- .github/workflows/_hcd-integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_hcd-integration-tests.yml b/.github/workflows/_hcd-integration-tests.yml index eb43da4..210d70b 100644 --- a/.github/workflows/_hcd-integration-tests.yml +++ b/.github/workflows/_hcd-integration-tests.yml @@ -39,4 +39,4 @@ jobs: working-directory: ${{ github.workspace }}/astra-db-java/src/test/resources - name: Run integration tests - run: mvn clean verify -pl astra-db-java -Plocal + run: mvn clean verify -pl astra-db-java -Plocal -Dtest.environment=local -Dlocal.endpoint=http://localhost:8181 -Dlocal.username=cassandra -Dlocal.password=cassandra -Dlocal.keyspace=default_keyspace From cfcfa56c602ca6d92315e7e5d1b695bdeca580fd Mon Sep 17 00:00:00 2001 From: toptobes Date: Wed, 4 Mar 2026 10:37:57 -0600 Subject: [PATCH 08/10] astra-dev ci --- .../workflows/_astra-integration-tests.yml | 31 +++++++++++++++++++ .github/workflows/_hcd-integration-tests.yml | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/_astra-integration-tests.yml diff --git a/.github/workflows/_astra-integration-tests.yml b/.github/workflows/_astra-integration-tests.yml new file mode 100644 index 0000000..daa0692 --- /dev/null +++ b/.github/workflows/_astra-integration-tests.yml @@ -0,0 +1,31 @@ +name: Run integration tests against Astra + +on: + workflow_call: + workflow_dispatch: + pull_request: # temporary until it's merged + branches: [ KG-ci-additions ] + push: + branches: [ KG-ci-additions ] + +permissions: + id-token: write + +jobs: + test-integration-hcd: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v6 + + - name: Setup Java 17 + uses: actions/setup-java@v5 + with: + java-version: '17' + distribution: 'temurin' + cache: 'maven' + + - name: Run integration tests + env: + ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} + run: mvn clean verify -pl astra-db-java -Pastra-dev diff --git a/.github/workflows/_hcd-integration-tests.yml b/.github/workflows/_hcd-integration-tests.yml index 210d70b..eb43da4 100644 --- a/.github/workflows/_hcd-integration-tests.yml +++ b/.github/workflows/_hcd-integration-tests.yml @@ -39,4 +39,4 @@ jobs: working-directory: ${{ github.workspace }}/astra-db-java/src/test/resources - name: Run integration tests - run: mvn clean verify -pl astra-db-java -Plocal -Dtest.environment=local -Dlocal.endpoint=http://localhost:8181 -Dlocal.username=cassandra -Dlocal.password=cassandra -Dlocal.keyspace=default_keyspace + run: mvn clean verify -pl astra-db-java -Plocal From b98845ff09a72c50e5ccda6a50878dbfe93e0806 Mon Sep 17 00:00:00 2001 From: toptobes Date: Wed, 4 Mar 2026 16:53:51 -0600 Subject: [PATCH 09/10] try running astra ci on prod? --- .github/workflows/_astra-integration-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_astra-integration-tests.yml b/.github/workflows/_astra-integration-tests.yml index daa0692..2662239 100644 --- a/.github/workflows/_astra-integration-tests.yml +++ b/.github/workflows/_astra-integration-tests.yml @@ -12,7 +12,7 @@ permissions: id-token: write jobs: - test-integration-hcd: + test-integration-astra: runs-on: ubuntu-latest steps: - name: Checkout code @@ -27,5 +27,5 @@ jobs: - name: Run integration tests env: - ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} - run: mvn clean verify -pl astra-db-java -Pastra-dev + ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }} + run: mvn clean verify -pl astra-db-java -Pastra-prod From 81bec797a5b8c3d8787a1f9e859c4f7715db7ce3 Mon Sep 17 00:00:00 2001 From: toptobes Date: Wed, 4 Mar 2026 16:55:54 -0600 Subject: [PATCH 10/10] aaaa --- .github/workflows/_astra-integration-tests.yml | 4 ++-- .github/workflows/_hcd-integration-tests.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_astra-integration-tests.yml b/.github/workflows/_astra-integration-tests.yml index 2662239..7f615c1 100644 --- a/.github/workflows/_astra-integration-tests.yml +++ b/.github/workflows/_astra-integration-tests.yml @@ -27,5 +27,5 @@ jobs: - name: Run integration tests env: - ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }} - run: mvn clean verify -pl astra-db-java -Pastra-prod + ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }} + run: mvn clean verify -pl astra-db-java -Pastra-dev diff --git a/.github/workflows/_hcd-integration-tests.yml b/.github/workflows/_hcd-integration-tests.yml index eb43da4..77e368e 100644 --- a/.github/workflows/_hcd-integration-tests.yml +++ b/.github/workflows/_hcd-integration-tests.yml @@ -3,10 +3,10 @@ name: Run integration tests against HCD on: workflow_call: workflow_dispatch: - pull_request: # temporary until it's merged - branches: [ KG-ci-additions ] - push: - branches: [ KG-ci-additions ] +# pull_request: # temporary until it's merged +# branches: [ KG-ci-additions ] +# push: +# branches: [ KG-ci-additions ] permissions: id-token: write