diff options
author | Luis Pabon <lpabon@redhat.com> | 2013-08-19 14:59:30 -0400 |
---|---|---|
committer | Luis Pabon <lpabon@redhat.com> | 2013-08-21 13:41:16 -0700 |
commit | 54bb5bec7a025eecb51f85274ec37dbd0c478758 (patch) | |
tree | 5652aabcff85e20c6a02f294338ac64385b861dd /tools | |
parent | 4023c7277ffb79df7021742143f403cd415047e8 (diff) |
Fix spec file to support source rpms
Our initial implementation only required Jenkins
to export binary RPMs, but as we move foward, we really
need to also export SRPMs. To support SRPMs, the spec
file in the RPM has to have the correct NAME, VERSION,
and RELEASE information.
Change-Id: Icd7132b4aafdbe7a1f02a35d0be7ad63b2e7c056
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/5669
Reviewed-by: Peter Portante <pportant@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: Peter Portante <pportant@redhat.com>
Reviewed-on: http://review.gluster.org/5679
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/functional_tests.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/functional_tests.sh b/tools/functional_tests.sh index f758145..e1be404 100755 --- a/tools/functional_tests.sh +++ b/tools/functional_tests.sh @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Globals +FUNCTAG=functest.$$ cleanup() { @@ -22,6 +24,7 @@ cleanup() sudo swift-init main stop sudo yum -y remove glusterfs-openstack-swift sudo rm -rf /etc/swift > /dev/null 2>&1 + rm -f build/glusterfs-openstack-swift-*${FUNCTAG}*rpm > /dev/null 2>&1 sudo rm -rf /mnt/gluster-object/test{,2}/* > /dev/null 2>&1 sudo setfattr -x user.swift.metadata /mnt/gluster-object/test{,2} > /dev/null 2>&1 } @@ -57,8 +60,8 @@ done export SWIFT_TEST_CONFIG_FILE=/etc/swift/test.conf # Create and install the rpm -PKG_RELEASE=functest bash makerpm.sh -sudo yum -y install build/glusterfs-openstack-swift-1.8.0-functest.noarch.rpm || fail "Unable to install rpm" +PKG_RELEASE=${FUNCTAG} bash makerpm.sh +sudo yum -y install build/glusterfs-openstack-swift-*${FUNCTAG}*.noarch.rpm || fail "Unable to install rpm" # Install the configuration files mkdir /etc/swift > /dev/null 2>&1 |