From 9d5147cf25c4f8aac8f40d579bca3e54d8ef9353 Mon Sep 17 00:00:00 2001 From: Ionut Balutoiu Date: Tue, 16 Nov 2021 23:11:15 +0200 Subject: [PATCH] Add branch param to the `ceph-windows-test` job The default value is `master`, since Windows builds for the master branch were enabled by https://github.com/ceph/ceph-build/pull/1928. The `get-bin.py` script is updated to support `--branchname` parameter: https://github.com/ceph/ceph-win32-tests/pull/1 --- ceph-windows-test/build/get_chacra_build | 6 +++++- ceph-windows-test/config/definitions/ceph-windows-test.yml | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ceph-windows-test/build/get_chacra_build b/ceph-windows-test/build/get_chacra_build index e6ad1339..217d7b66 100644 --- a/ceph-windows-test/build/get_chacra_build +++ b/ceph-windows-test/build/get_chacra_build @@ -3,6 +3,7 @@ set -o errexit set -o pipefail CEPH_WINDOWS_VERSION=${CEPH_WINDOWS_VERSION:-"1809"} +CEPH_WINDOWS_BRANCH=${CEPH_WINDOWS_BRANCH:-"master"} CEPH_WINDOWS_SHA1=${CEPH_WINDOWS_SHA1:-"latest"} GET_BIN_SCRIPT_URL="https://raw.githubusercontent.com/ceph/ceph-win32-tests/master/get-bin.py" @@ -13,4 +14,7 @@ GET_BIN_SCRIPT_URL="https://raw.githubusercontent.com/ceph/ceph-win32-tests/mast cd $WORKSPACE timeout 1m curl -L -o ./get-chacra-bin.py $GET_BIN_SCRIPT_URL chmod +x ./get-chacra-bin.py -timeout 10m ./get-chacra-bin.py --distrover $CEPH_WINDOWS_VERSION --sha1 $CEPH_WINDOWS_SHA1 +timeout 10m ./get-chacra-bin.py \ + --distrover $CEPH_WINDOWS_VERSION \ + --branchname $CEPH_WINDOWS_BRANCH \ + --sha1 $CEPH_WINDOWS_SHA1 diff --git a/ceph-windows-test/config/definitions/ceph-windows-test.yml b/ceph-windows-test/config/definitions/ceph-windows-test.yml index 004256e0..5840d03f 100644 --- a/ceph-windows-test/config/definitions/ceph-windows-test.yml +++ b/ceph-windows-test/config/definitions/ceph-windows-test.yml @@ -18,6 +18,10 @@ name: CEPH_WINDOWS_VERSION description: "The Windows version for the Ceph build." default: 1809 + - string: + name: CEPH_WINDOWS_BRANCH + description: "The branch name for the Ceph build." + default: master - string: name: CEPH_WINDOWS_SHA1 description: "The SHA1 for the Ceph build." -- 2.39.5