From: Zack Cerza <zack@redhat.com>
Date: Tue, 12 Nov 2024 18:45:28 +0000 (-0700)
Subject: Merge pull request #2285 from ceph/xz
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ef916ae70735c8fb12707e79b7bb0f060ab1956a;p=ceph-build.git

Merge pull request #2285 from ceph/xz
---

ef916ae70735c8fb12707e79b7bb0f060ab1956a
diff --cc ceph-dev-new-setup/build/build
index e42bbdbf,da22a22a..f5067bc6
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@@ -112,20 -106,23 +112,25 @@@ f
  if [ -d "$releasedir/$cephver" ]; then
      echo "$releasedir/$cephver already exists; reuse that release tarball"
  else
 -    dch -v $cephver-1 'autobuilder'
 +    # Create a container image to provide debian-specific utilities, so that this job can run on any container-capable host
 +    printf "FROM ubuntu:24.04\nRUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y dpkg-dev devscripts && apt-get clean && rm -rf /var/lib/apt/lists/*" | $PODMAN build -t ubuntu_builder -
 +    $PODMAN run --rm -v $PWD:/ceph:z ubuntu_builder:latest bash -c "cd /ceph && dch -v $cephver-1 'autobuilder'"
  
+     # declare an associative array to map file extensions to tar flags
+     declare -A compression=( ["bz2"]="j" ["gz"]="z" ["xz"]="J" )
+     for cmp in "${!compression[@]}"; do
+         rm -f ceph-*.tar.$cmp
+     done
      echo building tarball
-     rm ceph-*.tar.gz || true
-     rm ceph-*.tar.bz2 || true
- 
      ./make-dist $cephver
-     vers=`ls ceph-*.tar.bz2 | cut -c 6- | sed 's/.tar.bz2//'`
-     extension="tar.bz2"
-     extract_flags="jxf"
-     compress_flags="jcf"
- 
+     for cmp in "${!compression[@]}"; do
+       extension="tar.$cmp"
+       vers=$(ls ceph-*.$extension | cut -c 6- | sed "s/.$extension//" || true)
+       flag="${compression[$cmp]}"
+       extract_flags="${flag}xf"
+       compress_flags="${flag}cf"
+       if [ "$vers" != "" ]; then break; fi
+     done
      echo tarball vers $vers
  
      echo extracting