From e909cab8d5540f14eb3d11a5f2b7f08fe84f451e Mon Sep 17 00:00:00 2001
From: David Galloway <dgallowa@redhat.com>
Date: Thu, 19 Aug 2021 16:57:47 -0400
Subject: [PATCH] ceph-dev-*build: Notify shaman of a build sooner

Fixes: https://tracker.ceph.com/issues/18491

Signed-off-by: David Galloway <dgallowa@redhat.com>
---
 ceph-dev-build/build/setup_rpm     | 23 +++++++++++------------
 ceph-dev-new-build/build/setup_rpm | 21 +++++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index be71f1420..c13b854cd 100644
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -21,18 +21,9 @@ if test $(id -u) != 0 ; then
 fi
 export LC_ALL=C # the following is vulnerable to i18n
 
-$SUDO yum install -y redhat-lsb-core
-
-# unpack the tar.gz that contains the debian dir
-cd dist
-tar xzf *.orig.tar.gz
-cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/)
-pwd
-
-$SUDO yum install -y yum-utils
+$SUDO yum install -y redhat-lsb-core yum-utils
 
 get_rpm_dist
-setup_rpm_build_deps
 
 BRANCH=`branch_slash_filter $BRANCH`
 
@@ -40,8 +31,6 @@ if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then
     exit 0
 fi
 
-cd $WORKSPACE
-
 # Normalize variables across rpm/deb builds
 NORMAL_DISTRO=$DISTRO
 NORMAL_DISTRO_VERSION=$RELEASE
@@ -50,6 +39,16 @@ NORMAL_ARCH=$ARCH
 # create build status in shaman
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
+# unpack the tar.gz that contains the debian dir
+cd dist
+tar xzf *.orig.tar.gz
+cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/)
+pwd
+
+setup_rpm_build_deps
+
+cd $WORKSPACE
+
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index 49338cffb..c13b854cd 100644
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -21,16 +21,9 @@ if test $(id -u) != 0 ; then
 fi
 export LC_ALL=C # the following is vulnerable to i18n
 
-$SUDO yum install -y redhat-lsb-core
-
-# unpack the tar.gz that contains the debian dir
-cd dist
-tar xzf *.orig.tar.gz
-cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/)
-pwd
+$SUDO yum install -y redhat-lsb-core yum-utils
 
 get_rpm_dist
-setup_rpm_build_deps
 
 BRANCH=`branch_slash_filter $BRANCH`
 
@@ -38,8 +31,6 @@ if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then
     exit 0
 fi
 
-cd $WORKSPACE
-
 # Normalize variables across rpm/deb builds
 NORMAL_DISTRO=$DISTRO
 NORMAL_DISTRO_VERSION=$RELEASE
@@ -48,6 +39,16 @@ NORMAL_ARCH=$ARCH
 # create build status in shaman
 create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
 
+# unpack the tar.gz that contains the debian dir
+cd dist
+tar xzf *.orig.tar.gz
+cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/)
+pwd
+
+setup_rpm_build_deps
+
+cd $WORKSPACE
+
 pkgs=( "chacractl>=0.0.21" )
 TEMPVENV=$(create_venv_dir)
 VENV=${TEMPVENV}/bin
-- 
2.47.3