From 45bbbecef21dce7a36b62d18f6b883745d4346b9 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 25 Feb 2021 14:11:24 -0500 Subject: [PATCH] ceph-dev-new-build: tweak chacra binary and repo endpoints for windows Signed-off-by: Jason Dillaman --- ceph-dev-new-build/build/build_mingw | 2 +- ceph-dev-new-build/build/setup_mingw | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ceph-dev-new-build/build/build_mingw b/ceph-dev-new-build/build/build_mingw index 70ddfb23..4741e985 100644 --- a/ceph-dev-new-build/build/build_mingw +++ b/ceph-dev-new-build/build/build_mingw @@ -10,7 +10,7 @@ if [ "$THROWAWAY" = false ]; then [ "$FORCE" = true ] && chacra_binary="$chacra_binary --force" find build -name "*.zip" | - $chacra_create ${chacra_repo_endpoint} + $chacra_create ${chacra_binary_endpoint} # write json file with build info cat > $WORKSPACE/repo-extra.json << EOF diff --git a/ceph-dev-new-build/build/setup_mingw b/ceph-dev-new-build/build/setup_mingw index a8611678..53d3e552 100644 --- a/ceph-dev-new-build/build/setup_mingw +++ b/ceph-dev-new-build/build/setup_mingw @@ -54,8 +54,9 @@ FLAVOR="default" chacra_ref="$BRANCH" chacra_endpoint="ceph/${chacra_ref}/${SHA1}/${DIST}/${NORMAL_DISTRO_VERSION}" -chacra_repo_endpoint="${chacra_endpoint}/${ARCH}/flavors/${FLAVOR}" -chacra_check_url="${chacra_repo_endpoint}/ceph.zip" +chacra_binary_endpoint="${chacra_endpoint}/${ARCH}/flavors/${FLAVOR}" +chacra_repo_endpoint="${chacra_endpoint}/flavors/${FLAVOR}" +chacra_check_url="${chacra_binary_endpoint}/ceph.zip" if [ "$THROWAWAY" = false ] ; then # this exists in scripts/build_utils.sh -- 2.39.5