From ef72fc2a5eb38417782d63efceba028311013a54 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 13 Feb 2025 19:28:46 -0800 Subject: [PATCH] jenkins-job-builder,ceph-build-pull-requests: fetch and use jjb 6 currently it's actually a custom version of jjb6, to add new choosing-strategy: ancestry, to be able to use maximum-age in days to choose a branch to build. This will change to 6.5 once that branch is released. Signed-off-by: Dan Mick sq --- ceph-build-pull-requests/build/build | 2 +- jenkins-job-builder/build/build | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ceph-build-pull-requests/build/build b/ceph-build-pull-requests/build/build index e8fa10fe..089942dd 100644 --- a/ceph-build-pull-requests/build/build +++ b/ceph-build-pull-requests/build/build @@ -3,7 +3,7 @@ set -e # the following two methods exist in scripts/build_utils.sh -pkgs=( "ansible" "ansible-core" "jenkins-job-builder>=3.5.0,<6.0.0" "urllib3==1.26.1" "pyopenssl" "ndg-httpsclient" "pyasn1" ) +pkgs=( "ansible" "ansible-core" "git+https://opendev.org/jjb/jenkins-job-builder@60f0316389" "urllib3==1.26.1" "pyopenssl" "ndg-httpsclient" "pyasn1" ) TEMPVENV=$(create_venv_dir) VENV=${TEMPVENV}/bin install_python_packages $TEMPVENV "pkgs[@]" diff --git a/jenkins-job-builder/build/build b/jenkins-job-builder/build/build index ed12e99d..c58a0bef 100644 --- a/jenkins-job-builder/build/build +++ b/jenkins-job-builder/build/build @@ -8,8 +8,15 @@ set -euxo pipefail -# the following two methods exist in scripts/build_utils.sh -pkgs=( "dataclasses" "jenkins-job-builder>=3.5.0,<6.0.0" ) +# the jjb version is an unreleased patch from dmick to add support for 'ancestry' build choosers +# for ceph-dev-new-trigger, to allow it to be configured to only look at branches up to N days +# old. This is just arguably better, but also useful when jenkins (or that plugin) decides it +# needs to build every branch. +# +# when jenkins-job-builder 6.5 or later is released, this requirement should change to +# jenkins-job-builder>=6.5 + +pkgs=( "dataclasses" "git+https://opendev.org/jjb/jenkins-job-builder@60f0316389" ) TEMPVENV=$(create_venv_dir) VENV=${TEMPVENV}/bin install_python_packages $TEMPVENV "pkgs[@]" latest -- 2.47.3