Merge branch 'cassandra-5.0' into trunk

* cassandra-5.0:
  Only prefetch docker image needed in jenkinsfile build stages
This commit is contained in:
mck 2025-04-08 17:30:01 +02:00
commit c02a6a0605
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
1 changed files with 1 additions and 1 deletions

View File

@ -337,7 +337,7 @@ def build(command, cell) {
test -f .jenkins/Jenkinsfile || { echo "Invalid git fork/branch"; exit 1; }
grep -q "Jenkins CI declaration" .jenkins/Jenkinsfile || { echo "Only Cassandra 5.0+ supported"; exit 1; }
"""
fetchDockerImages(['almalinux-build', 'bullseye-build'])
fetchDockerImages("redhat" == cell.step ? ['almalinux-build'] : ['bullseye-build'])
def cell_suffix = "_jdk${cell.jdk}_${cell.arch}"
def logfile = "stage-logs/${JOB_NAME}_${BUILD_NUMBER}_${cell.step}${cell_suffix}_attempt${attempt}.log.xz"
def script_vars = "#!/bin/bash \n set -o pipefail ; " // pipe to tee needs pipefail