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

diff --git a/ceph-windows-test/build/get_chacra_build b/ceph-windows-test/build/get_chacra_build
index e6ad133918ee32f37a6a28e9da817e5893fa446d..217d7b667ce7f567bd327a9d77af08e43ef627f5 100644 (file)
--- 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 004256e05c811b7c78d44b3d1f89a64c4f3f88f6..5840d03fdb01a1c5dd6f5551e140abdbe2926f7e 100644 (file)
--- 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."