From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 25 Feb 2021 18:19:57 +0000 (-0500)
Subject: ceph-dev-new-build: extract artifacts prior to attempting windows build
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a5f7a82f27661e487cd6ac923d148f57c74110e0;p=ceph-build.git

ceph-dev-new-build: extract artifacts prior to attempting windows build

Also fixed the chacra endpoints to be consistent between the setup and
build steps.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/ceph-dev-new-build/build/build_mingw b/ceph-dev-new-build/build/build_mingw
index cb8ebcc8..70ddfb23 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_endpoint}/source/flavors/${FLAVOR}
+        $chacra_create ${chacra_repo_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 f430aa98..a8611678 100644
--- a/ceph-dev-new-build/build/setup_mingw
+++ b/ceph-dev-new-build/build/setup_mingw
@@ -20,12 +20,16 @@ export LC_ALL=C # the following is vulnerable to i18n
 
 BRANCH=`branch_slash_filter $BRANCH`
 
-cd $WORKSPACE
-
-vers=$(cat ./dist/version)
+cd ${WORKSPACE}/dist
+vers=$(cat version)
 raw_version=`echo $vers | cut -d '-' -f 1`
 RELEASE_BRANCH=$(release_from_version $raw_version)
 
+# unpack the tar.gz that contains the source
+tar xzf *.orig.tar.gz
+cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/)
+pwd
+
 raw_version_major=$(echo $vers | cut -d '.' -f 1)
 if [ 0${raw_version_major} -lt 16 ]; then
     echo The following Ceph release does not support Windows: $RELEASE_BRANCH
@@ -49,9 +53,9 @@ make_chacractl_config
 FLAVOR="default"
 
 chacra_ref="$BRANCH"
-chacra_endpoint="ceph/${chacra_ref}/${SHA1}/${DIST}/${ARCH}"
-chacra_repo_endpoint="${chacra_endpoint}/flavors/${FLAVOR}"
-chacra_check_url="${chacra_endpoint}/ceph.zip"
+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"
 
 if [ "$THROWAWAY" = false ] ; then
     # this exists in scripts/build_utils.sh