From 9a3b3fd6c8f62a0bd82cb0f01d1a964d1f8149af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Reis?= <joao.r.reis@outlook.com>
Date: Thu, 21 May 2026 16:42:23 +0100
Subject: [PATCH 1/2] fix DSE CI by using a new download location

---
 .github/CODEOWNERS          |  2 +-
 .github/workflows/tests.yml | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9c65fbda..adbc705f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
-* @joao-r-reis @alicel @grighetto @absurdfarce @weideng1 @lukasz-antoniak
+* @joao-r-reis
 .snyk @datastax/sec-eng
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 22a8bbe3..1510a0f6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -135,7 +135,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cassandra_version: [ '2.2.19', '3.11.19', '4.1.9', '5.0.6', 'dse-4.8.16', 'dse-5.1.48', 'dse-6.8.61' ]
+        cassandra_version: [ '2.2.19', '3.11.19', '4.1.9', '5.0.6', 'dse-5.1.48', 'dse-6.8.61', 'dse-6.9.9' ]
     steps:
       - uses: actions/checkout@v2
             
@@ -151,6 +151,36 @@ jobs:
           path: ~/.ccm/repository
           key: ${{ runner.os }}-ccm-${{ matrix.cassandra_version }}
 
+      - name: Prepare DSE artifacts for CCM
+        if: ${{ startsWith(matrix.cassandra_version, 'dse-') }}
+        env:
+          DSE_DOWNLOAD_BASE_URL: ${{ secrets.DSE_DOWNLOAD_BASE_URL }}
+          DSE_DOWNLOAD_USERNAME: ${{ secrets.DSE_DOWNLOAD_USERNAME }}
+          DSE_DOWNLOAD_PASSWORD: ${{ secrets.DSE_DOWNLOAD_PASSWORD }}
+        run: |
+          DSE_VERSION="${{ matrix.cassandra_version }}"
+          DSE_VERSION="${DSE_VERSION#dse-}"
+          DSE_TARBALL_URL="${DSE_DOWNLOAD_BASE_URL}/${{ matrix.cassandra_version }}-bin.tar.gz"
+          DSE_VERSION_DIR="${HOME}/.ccm/repository/${DSE_VERSION}"
+          DSE_TARBALL_PATH="${RUNNER_TEMP}/dse-${DSE_VERSION}.tar.gz"
+
+          mkdir -p ~/.ccm/repository
+
+          if [[ -d "${DSE_VERSION_DIR}" ]]; then
+            echo "Reusing existing extracted DSE directory at ${DSE_VERSION_DIR}"
+          else
+            if [[ -z "${DSE_DOWNLOAD_USERNAME}" || -z "${DSE_DOWNLOAD_PASSWORD}" ]]; then
+              echo "DSE_DOWNLOAD_USERNAME and DSE_DOWNLOAD_PASSWORD must both be set to download DSE artifacts"
+              exit 1
+            fi
+
+            wget --user "${DSE_DOWNLOAD_USERNAME}" --password "${DSE_DOWNLOAD_PASSWORD}" -O "${DSE_TARBALL_PATH}" "${DSE_TARBALL_URL}"
+
+            mkdir -p "${DSE_VERSION_DIR}"
+            tar -xzf "${DSE_TARBALL_PATH}" -C "${DSE_VERSION_DIR}" --strip-components=1
+            rm -f "${DSE_TARBALL_PATH}"
+          fi
+
       - name: Run
         run: |
           sudo apt update

From a7e4d712171238c7b753c9acdd6c2540720e24ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Reis?= <joao.r.reis@outlook.com>
Date: Thu, 21 May 2026 17:01:21 +0100
Subject: [PATCH 2/2] fix java home for dse-6.9

---
 .github/workflows/tests.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1510a0f6..b7736a00 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -188,9 +188,12 @@ jobs:
           sudo apt -y install openjdk-8-jdk gcc git wget pip
           sudo apt -y install openjdk-11-jdk gcc git wget pip
 
-          export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
           export JAVA8_HOME=/usr/lib/jvm/java-8-openjdk-amd64
           export JAVA11_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+          export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+          if [[ "${{ matrix.cassandra_version }}" == dse-6.9* ]]; then
+            export JAVA_HOME=$JAVA11_HOME
+          fi
           export PATH=$JAVA_HOME/bin:$PATH
           java -version