(solr) branch branch_9x updated: Backport SOLR-17091 (#2106)

[gu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gus pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 55ef7f4691d Backport SOLR-17091 (#2106)
55ef7f4691d is described below

commit 55ef7f4691d15a981abc100872810a9ec68041f7
Author: Gus Heck <46...@users.noreply.github.com>
AuthorDate: Wed Nov 29 19:00:27 2023 -0500

    Backport SOLR-17091 (#2106)
    
    * SOLR-17091 Update cloud.sh to ignore -slim.tgz. (#2104)
    
    (cherry picked from commit 07accf4dffe1ca4bf6e93330753457a3ba154e4e)
    
    * SOLR-17091 fix edit that got missed in last commit (#2105)
    
    (cherry picked from commit 7bb28b43872d3d9e72d552aabde0e1afe329957e)
---
 dev-tools/scripts/cloud.sh | 5 +++--
 solr/CHANGES.txt           | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-tools/scripts/cloud.sh b/dev-tools/scripts/cloud.sh
index 38f9d6c84ef..cb29f4f27b0 100755
--- a/dev-tools/scripts/cloud.sh
+++ b/dev-tools/scripts/cloud.sh
@@ -280,10 +280,11 @@ copyTarball() {
       curl -o "$RC_FILE" "$SMOKE_RC_URL"
       pushd
     else
-      if [[ ! -f $(ls "$VCS_WORK"/solr/packaging/build/distributions/solr-*.tgz) ]]; then
+      TARBALL=$(find "$VCS_WORK" -regex '.*/solr-.*\.tgz' | grep -v slim)
+      if [[ ! -f "$TARBALL" ]]; then
         echo "No solr tarball found try again with -r"; popd; exit 10;
       fi
-      cp "$VCS_WORK"/solr/packaging/build/distributions/solr-*.tgz ${CLUSTER_WD}
+      cp "$TARBALL" "${CLUSTER_WD}"
     fi
     pushd # back into cluster wd to unpack
     tar xzvf solr-*.tgz
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 091ecf0ef25..8cde8d126ae 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -74,6 +74,9 @@ Other Changes
 
 * SOLR-17078: The `train_and_upload_demo_model.py` script referenced in LTR documentation now uses Python3 (Jason Gerlowski)
 
+* SOLR-17091: dev tools script cloud.sh became broken after changes in 9.3 added a new -slim.tgz file it was not expecting
+  cloud.sh has been updated to ignore the -slim.tgz version of the tarball.
+
 ==================  9.4.0 ==================
 New Features
 ---------------------