packaging: harden smoke test startup and timeouts

.github/workflows/build-lint-and-test.yml

@@ -60,64 +60,80 @@ jobs:
 
     strategy:
       matrix:
-        scylla-version: [ENTERPRISE-RELEASE, ENTERPRISE-PRIOR-RELEASE]
+        scylla-version: [LATEST, PRIOR, LTS-LATEST, LTS-PRIOR]
       fail-fast: false
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Python 3
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
       - name: Update apt cache
         run: sudo apt-get update -y
 
       - name: Install CCM
         run: |
-          make install-ccm-if-missing
+          PATH="$HOME/.local/bin:$PATH" make install-ccm-if-missing
+
+      - name: Select scylla filter
+        id: scylla-filter
+        run: |
+          # Select the latest stable patch on each release line and drop
+          # prerelease tags before taking the requested position.
+          case "${{ matrix.scylla-version }}" in
+            LATEST)
+              printf 'value=%s\n' '^[0-9]{4}$.^[2-9][0-9]*$.LAST and *.*.^[0-9]+$ and LAST' >> "$GITHUB_OUTPUT"
+              ;;
+            PRIOR)
+              printf 'value=%s\n' '^[0-9]{4}$.^[2-9][0-9]*$.LAST and *.*.^[0-9]+$ and LAST-1' >> "$GITHUB_OUTPUT"
+              ;;
+            LTS-LATEST)
+              printf 'value=%s\n' '^[0-9]{4}$.1.LAST and *.*.^[0-9]+$ and LAST' >> "$GITHUB_OUTPUT"
+              ;;
+            LTS-PRIOR)
+              printf 'value=%s\n' '^[0-9]{4}$.1.LAST and *.*.^[0-9]+$ and LAST-1' >> "$GITHUB_OUTPUT"
+              ;;
+            *)
+              echo "Unknown scylla version name ${{ matrix.scylla-version }}"
+              exit 1
+              ;;
+          esac
 
       - name: Get scylla version
         id: scylla-version
+        uses: scylladb-actions/get-version@v0.4.5
+        with:
+          source: dockerhub-imagetag
+          repo: scylladb/scylla
+          filters: ${{ steps.scylla-filter.outputs.value }}
+
+      - name: Resolve scylla version
+        id: scylla-version-value
         run: |
-          if [[ "${{ matrix.scylla-version }}" == "ENTERPRISE-RELEASE" ]]; then
-            echo "value=$(python3 ci/version_fetch.py --version-index 1 scylla-enterprise-stable:1 | tr -d '\"')" | tee -a $GITHUB_OUTPUT
-          elif [[ "${{ matrix.scylla-version }}" == "ENTERPRISE-PRIOR-RELEASE" ]]; then
-            echo "value=$(python3 ci/version_fetch.py --version-index 2 scylla-enterprise-stable:2 | tr -d '\"')" | tee -a $GITHUB_OUTPUT
-          elif [[ "${{ matrix.scylla-version }}" == "ENTERPRISE-RC" ]]; then
-            echo "value=$(python3 ci/version_fetch.py --version-index 1 scylla-enterprise-rc | tr -d '\"')" | tee -a $GITHUB_OUTPUT
-          elif [[ "${{ matrix.scylla-version }}" == "OSS-RELEASE" ]]; then
-            echo "value=$(python3 ci/version_fetch.py --version-index 1 scylla-oss-stable:1 | tr -d '\"')" | tee -a $GITHUB_OUTPUT
-          elif [[ "${{ matrix.scylla-version }}" == "OSS-PRIOR-RELEASE" ]]; then
-            echo "value=$(python3 ci/version_fetch.py --version-index 2 scylla-oss-stable:2 | tr -d '\"')" | tee -a $GITHUB_OUTPUT
-          elif [[ "${{ matrix.scylla-version }}" == "OSS-RC" ]]; then
-            echo "value=$(python3 ci/version_fetch.py --version-index 1 scylla-oss-rc | tr -d '\"')" | tee -a $GITHUB_OUTPUT
-          elif echo "${{ matrix.scylla-version }}" | grep -P '^[0-9\.]+'; then # If you want to run specific version do just that
-            echo "value=${{ matrix.scylla-version }}" | tee -a $GITHUB_OUTPUT
-          else
-            echo "Unknown scylla version name `${{ matrix.scylla-version }}`"
+          value='${{ fromJson(steps.scylla-version.outputs.versions)[0] }}'
+          if [ -z "$value" ]; then
+            echo "No Scylla version resolved for ${{ matrix.scylla-version }}" >&2
             exit 1
           fi
+          echo "value=$value" | tee -a "$GITHUB_OUTPUT"
 
       - name: Pull CCM image from the cache
         uses: actions/cache/restore@v4
         id: pull-image
         with:
           path: ~/.ccm/scylla-repository
-          key: image-scylla-${{ runner.os }}-${{ steps.scylla-version.outputs.value }}
+          key: image-scylla-${{ runner.os }}-${{ steps.scylla-version-value.outputs.value }}
 
-      - name: Download Scylla (${{ steps.scylla-version.outputs.value }}) image
+      - name: Download Scylla (${{ steps.scylla-version-value.outputs.value }}) image
         if: steps.pull-image.outputs.cache-hit != 'true'
-        run: SCYLLA_VERSION="release:${{ steps.scylla-version.outputs.value }}" make download-ccm-scylla-image
+        run: |
+          PATH="$HOME/.local/bin:$PATH" SCYLLA_VERSION="release:${{ steps.scylla-version-value.outputs.value }}" make download-ccm-scylla-image
 
       - name: Save CCM image cache
         uses: actions/cache/save@v4
         if: steps.pull-image.outputs.cache-hit != 'true'
         with:
           path: ~/.ccm/scylla-repository
-          key: image-scylla-${{ runner.os }}-${{ steps.scylla-version.outputs.value }}
+          key: image-scylla-${{ runner.os }}-${{ steps.scylla-version-value.outputs.value }}
 
       - name: Pull integration test binary
         uses: actions/cache/restore@v4
@@ -134,9 +150,10 @@ jobs:
       - name: Prepare environment
         run: make update-rust-tooling prepare-integration-test
 
-      - name: Run integration tests on Scylla ${{ steps.scylla-version.outputs.value }}
+      - name: Run integration tests on Scylla ${{ steps.scylla-version-value.outputs.value }}
         id: run-integration-tests
-        run: SCYLLA_VERSION="release:${{ steps.scylla-version.outputs.value }}" make run-test-integration-scylla
+        run: |
+          PATH="$HOME/.local/bin:$PATH" SCYLLA_VERSION="release:${{ steps.scylla-version-value.outputs.value }}" make run-test-integration-scylla
 
       - name: Upload test logs
         uses: actions/upload-artifact@v4
@@ -158,7 +175,7 @@ jobs:
 
     strategy:
       matrix:
-        cassandra-version: [RELEASE-3.X]
+        cassandra-version: [3-LATEST]
         java-version: [8]
       fail-fast: false
 
@@ -172,45 +189,48 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: "adopt"
 
-      - name: Setup Python 3
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
       - name: Update apt cache
         run: sudo apt-get update -y
 
       - name: Install CCM
-        run: make install-ccm-if-missing
+        run: |
+          PATH="$HOME/.local/bin:$PATH" make install-ccm-if-missing
 
       - name: Get cassandra version
         id: cassandra-version
+        uses: scylladb-actions/get-version@v0.4.5
+        with:
+          source: github-tag
+          repo: apache/cassandra
+          prefix: cassandra-
+          out-no-prefix: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          filters: '^[0-9]+$.^[0-9]+$.^[0-9]+$ and 3.LAST.LAST'
+
+      - name: Resolve cassandra version
+        id: cassandra-version-value
         run: |
-          if [[ "${{ matrix.cassandra-version }}" == "RELEASE-3.X" ]]; then
-            echo "value=$(python3 ci/version_fetch.py --version-index 1 cassandra3-stable:1 | tr -d '\"')" | tee -a $GITHUB_OUTPUT
-          elif [[ "${{ matrix.cassandra-version }}" == "RELEASE-4.X" ]]; then
-            echo "value=$(python3 ci/version_fetch.py --version-index 1 cassandra4-stable:1 | tr -d '\"')" | tee -a $GITHUB_OUTPUT
-          else
-            echo "Unknown cassandra version name `${{ matrix.cassandra-version }}`"
-          fi
+          value=${{ fromJson(steps.cassandra-version.outputs.versions)[0] }}
+          echo "value=${value#cassandra-}" | tee -a "$GITHUB_OUTPUT"
 
       - name: Pull CCM image from the cache
         uses: actions/cache/restore@v4
         id: pull-image
         with:
           path: ~/.ccm/repository
-          key: image-cassandra-${{ runner.os }}-${{ steps.cassandra-version.outputs.value }}
+          key: image-cassandra-${{ runner.os }}-${{ steps.cassandra-version-value.outputs.value }}
 
-      - name: Download Cassandra (${{ steps.cassandra-version.outputs.value }}) image
+      - name: Download Cassandra (${{ steps.cassandra-version-value.outputs.value }}) image
         if: steps.pull-image.outputs.cache-hit != 'true'
-        run: CASSANDRA_VERSION="${{ steps.cassandra-version.outputs.value }}" make download-ccm-cassandra-image
+        run: |
+          PATH="$HOME/.local/bin:$PATH" CASSANDRA_VERSION="${{ steps.cassandra-version-value.outputs.value }}" make download-ccm-cassandra-image
 
       - name: Save CCM image cache
         uses: actions/cache/save@v4
         if: steps.pull-image.outputs.cache-hit != 'true'
         with:
           path: ~/.ccm/repository
-          key: image-cassandra-${{ runner.os }}-${{ steps.cassandra-version.outputs.value }}
+          key: image-cassandra-${{ runner.os }}-${{ steps.cassandra-version-value.outputs.value }}
 
       - name: Pull integration test binary
         uses: actions/cache/restore@v4
@@ -227,9 +247,10 @@ jobs:
       - name: Prepare environment
         run: make update-rust-tooling prepare-integration-test
 
-      - name: Run integration tests on Cassandra ${{ steps.cassandra-version.outputs.value }}
+      - name: Run integration tests on Cassandra ${{ steps.cassandra-version-value.outputs.value }}
         id: run-integration-tests
-        run: CASSANDRA_VERSION="${{ steps.cassandra-version.outputs.value }}" make run-test-integration-cassandra
+        run: |
+          PATH="$HOME/.local/bin:$PATH" CASSANDRA_VERSION="${{ steps.cassandra-version-value.outputs.value }}" make run-test-integration-cassandra
 
       - name: Upload test logs
         uses: actions/upload-artifact@v4

Makefile

@@ -7,6 +7,14 @@ SHELL := bash
 ifeq ($(OS),Windows_NT)
     SHELL := pwsh.exe
     .SHELLFLAGS := -NoProfile -Command $$ErrorActionPreference = 'Stop';
+else
+    # Prefer the repo-local CCM shim, which can execute the cloned upstream tree
+    # and still fall back to a user-installed console script when present.
+    export PATH := $(HOME)/.local/bin:$(CURDIR)/ci:$(PATH)
+    CCM_SOURCE_DIR ?= $(HOME)/.ccm/scylla-ccm
+    export CCM_SOURCE_DIR
+    CCM_BIN ?= $(CURDIR)/ci/ccm
+    export CCM_BIN
 endif
 
 UNAME_S := $(shell uname -s)
@@ -176,6 +184,10 @@ ifndef CCM_COMMIT_ID
 	export CCM_COMMIT_ID := master
 endif
 
+ifndef CCM_PIP_DEPENDENCIES
+	CCM_PIP_DEPENDENCIES := ruamel-yaml psutil requests packaging boto3 tqdm urllib3
+endif
+
 ifndef SCYLLA_VERSION
 	SCYLLA_VERSION := release:2025.3
 endif
@@ -242,13 +254,19 @@ install-clang-format-if-missing: update-apt-cache-if-needed
 	)
 
 install-ccm-if-missing:
-	@ccm list >/dev/null 2>&1 || (
+	@$(CCM_BIN) list >/dev/null 2>&1 || (
 		echo "CCM not found in the system, install it."
-		pip3 install --user https://github.com/scylladb/scylla-ccm/archive/${CCM_COMMIT_ID}.zip
+		mkdir -p "$(dir $(CCM_SOURCE_DIR))" && \
+		rm -rf "$(CCM_SOURCE_DIR)" && \
+		git clone --depth 1 --branch "${CCM_COMMIT_ID}" https://github.com/scylladb/scylla-ccm.git "$(CCM_SOURCE_DIR)" && \
+		python3 -m pip install --user ${CCM_PIP_DEPENDENCIES}
 	)
 
 install-ccm:
-	@pip3 install --user https://github.com/scylladb/scylla-ccm/archive/${CCM_COMMIT_ID}.zip
+	@mkdir -p "$(dir $(CCM_SOURCE_DIR))" && \
+	rm -rf "$(CCM_SOURCE_DIR)" && \
+	git clone --depth 1 --branch "${CCM_COMMIT_ID}" https://github.com/scylladb/scylla-ccm.git "$(CCM_SOURCE_DIR)" && \
+	python3 -m pip install --user ${CCM_PIP_DEPENDENCIES}
 
 install-java8-if-missing:
 	@dpkg -l openjdk-8-jre >/dev/null 2>&1 && exit 0
@@ -431,14 +449,14 @@ download-ccm-scylla-image: install-ccm-if-missing
 	@echo "Downloading scylla ${SCYLLA_VERSION} CCM image"
 	@rm -rf /tmp/download-scylla.ccm || true
 	@mkdir /tmp/download-scylla.ccm || true
-	@ccm create ccm_1 -i 127.0.1. -n 3:0 -v "${SCYLLA_VERSION}" --scylla --config-dir=/tmp/download-scylla.ccm
+	@$(CCM_BIN) create ccm_1 -i 127.0.1. -n 3:0 -v "${SCYLLA_VERSION}" --scylla --config-dir=/tmp/download-scylla.ccm
 	@rm -rf /tmp/download-scylla.ccm
 
 download-ccm-cassandra-image: install-ccm-if-missing
 	@echo "Downloading cassandra ${CASSANDRA_VERSION} CCM image"
 	@rm -rf /tmp/download-cassandra.ccm || true
 	@mkdir /tmp/download-cassandra.ccm || true
-	@ccm create ccm_1 -i 127.0.1. -n 3:0 -v "${CASSANDRA_VERSION}" --config-dir=/tmp/download-cassandra.ccm
+	@$(CCM_BIN) create ccm_1 -i 127.0.1. -n 3:0 -v "${CASSANDRA_VERSION}" --config-dir=/tmp/download-cassandra.ccm
 	@rm -rf /tmp/download-cassandra.ccm
 
 run-test-integration-scylla: .prepare-environment-update-aio-max-nr

ci/ccm

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+source_ccm="${CCM_SOURCE_DIR:-$HOME/.ccm/scylla-ccm}"
+if [ -n "$source_ccm" ] && [ -f "$source_ccm/ccm" ]; then
+  export PYTHONPATH="$source_ccm${PYTHONPATH:+:$PYTHONPATH}"
+  exec python3 "$source_ccm/ccm" "$@"
+fi
+
+user_ccm="$(python3 -m site --user-base)/bin/ccm"
+if [ -f "$user_ccm" ]; then
+  exec python3 "$user_ccm" "$@"
+fi
+
+user_site="$(python3 -m site --user-site)"
+if [ -n "${PYTHONPATH:-}" ]; then
+  export PYTHONPATH="${user_site}:${PYTHONPATH}"
+else
+  export PYTHONPATH="${user_site}"
+fi
+
+exec python3 -c 'from ccmlib.bin import main; main()' "$@"