From 3290ebb23cb55ea046779ebc5c18c01858bd3871 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 11 Jan 2017 09:37:31 -0600 Subject: [PATCH] ceph-dev-build: post build status to shaman for rpm builds earlier Moves the post to shaman earlier in the script so if we have package failures later in the script an update is still sent to shaman. Signed-off-by: Andrew Schoen --- ceph-dev-build/build/setup_rpm | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm index 45384248..78004d42 100644 --- a/ceph-dev-build/build/setup_rpm +++ b/ceph-dev-build/build/setup_rpm @@ -29,24 +29,6 @@ tar xzf *.orig.tar.gz cd ceph-* pwd -case $(lsb_release -si) in -CentOS|Fedora|SUSE*|RedHatEnterpriseServer) - case $(lsb_release -si) in - SUSE*) - $SUDO zypper -y yum-utils - ;; - *) - $SUDO yum install -y yum-utils - ;; - esac - sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec - $SUDO yum-builddep -y $DIR/ceph.spec - ;; -*) - echo "$(lsb_release -si) is unknown, dependencies will have to be installed manually." - ;; -esac - BRANCH=`branch_slash_filter $BRANCH` if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then @@ -110,6 +92,24 @@ NORMAL_ARCH=$ARCH # create build status in shaman create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH +case $(lsb_release -si) in +CentOS|Fedora|SUSE*|RedHatEnterpriseServer) + case $(lsb_release -si) in + SUSE*) + $SUDO zypper -y yum-utils + ;; + *) + $SUDO yum install -y yum-utils + ;; + esac + sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec + $SUDO yum-builddep -y $DIR/ceph.spec + ;; +*) + echo "$(lsb_release -si) is unknown, dependencies will have to be installed manually." + ;; +esac + pkgs=( "chacractl>=0.0.4" ) install_python_packages "pkgs[@]" -- 2.47.3