From ab5dd2d33fcfda40ab5b766939e22660830ca08b Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 11 Jan 2017 17:14:12 -0600 Subject: [PATCH] Revert "Send status to shaman earlier when building ceph rpm binaries" --- ceph-dev-build/build/setup_rpm | 36 +++++++++++++++--------------- ceph-dev-new-build/build/setup_rpm | 36 +++++++++++++++--------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm index 78004d42..45384248 100644 --- a/ceph-dev-build/build/setup_rpm +++ b/ceph-dev-build/build/setup_rpm @@ -29,6 +29,24 @@ 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 @@ -92,24 +110,6 @@ 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[@]" diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm index 78004d42..45384248 100644 --- a/ceph-dev-new-build/build/setup_rpm +++ b/ceph-dev-new-build/build/setup_rpm @@ -29,6 +29,24 @@ 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 @@ -92,24 +110,6 @@ 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.39.5