Modified RPM build to pick up the glustermg.war.tar.gz from SOURCES directory. Also changed the name of the back-end tar file to include the word 'backend'

4 files changed, 16 insertions, 27 deletions

diff --git a/build/create-rpms.sh b/build/create-rpms.sh
index f74902d3..b02ae91e 100755
--- a/build/create-rpms.sh
+++ b/build/create-rpms.sh
@@ -1,6 +1,9 @@
-sudo cp glustermg-${VERSION}.tar.gz /usr/src/redhat/SOURCES
-sudo rpmbuild --define "release_version ${VERSION}" -bb build/glustermg.spec
-sudo rm -rf rpms
-sudo mkdir rpms
-sudo mv /usr/src/redhat/RPMS/x86_64/glustermg*.rpm rpms
-sudo chown -R jenkins:jenkins rpms
+FILE_ERR=1
+RPM_ERR=2
+sudo cp glustermg-backend-${VERSION}.tar.gz /usr/src/redhat/SOURCES || exit ${FILE_ERR}
+sudo cp glustermg-${VERSION}.war.tar.gz /usr/src/redhat/SOURCES || exit ${FILE_ERR}
+sudo rpmbuild --define "release_version ${VERSION}" -bb build/glustermg.spec || exit ${RPM_ERR}
+sudo rm -rf rpms || exit ${FILE_ERR}
+sudo mkdir rpms || exit ${FILE_ERR}
+sudo mv /usr/src/redhat/RPMS/x86_64/glustermg*.rpm rpms || exit ${FILE_ERR}
+sudo chown -R jenkins:jenkins rpms || exit ${FILE_ERR}
diff --git a/build/glustermg.spec b/build/glustermg.spec
index db8e9d7c..7e7eb533 100644
--- a/build/glustermg.spec
+++ b/build/glustermg.spec
@@ -1,12 +1,5 @@
-# the war can be picked up from current directory instead of the url
-# %define glustermg_war_url http://build.gluster.com:8080/job/glustermg-package/lastSuccessfulBuild/artifact/glustermg.war.tar.gz
-
 %define product_family Gluster Management Gateway
 
-# following comment to be removed after testing passing of
-# release_version as a parameter using --define "release_version ${VERSION}"
-# %define release_version 1.0.0
-
 %define current_arch %{_arch}
 %ifarch i386
 %define current_arch x86
@@ -18,7 +11,7 @@ Version:        %{release_version}
 Release:        1%{?extra_release}
 License:        Proprietary
 Group:          System Environment/Base
-Source0:        glustermg-%{release_version}.tar.gz
+Source0:        glustermg-backend-%{release_version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:       tomcat5 >= 5.5.23
 Requires:       java-1.6.0-openjdk >= 1.6.0.0
@@ -44,7 +37,7 @@ Requires:       libxml2 >= 2.6.26
 
 
 %prep
-%setup -q -n glustermg-%{release_version}
+%setup -q -n glustermg-backend-%{release_version}
 
 %build
 
@@ -54,15 +47,7 @@ mkdir -p $RPM_BUILD_ROOT/opt/glustermg/%{release_version}
 mkdir -p $RPM_BUILD_ROOT/opt/glustermg/keys
 mkdir -p $RPM_BUILD_ROOT/opt/glustermg/etc
 mkdir -p $RPM_BUILD_ROOT/var/log/glustermg
-
-# following comment to be removed after testing picking up war file from current directory
-# wget -P $RPM_BUILD_ROOT %{glustermg_war_url}
-# tar -C $RPM_BUILD_ROOT/opt/glustermg/%{release_version} -zxf $RPM_BUILD_ROOT/glustermg.war.tar.gz
-# rm -f $RPM_BUILD_ROOT/glustermg.war.tar.gz
-
-tar -C $RPM_BUILD_ROOT/opt/glustermg/%{release_version} -zxf glustermg-%{release_version}.war.tar.gz
-rm -f glustermg-${VERSION}.war.tar.gz
-
+tar -C $RPM_BUILD_ROOT/opt/glustermg/%{release_version} -zxf %{_sourcedir}/glustermg-%{release_version}.war.tar.gz
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 ln -sf /opt/glustermg/%{release_version}/glustermg/scripts/grun.py %{buildroot}%{_bindir}/grun.py
diff --git a/build/package-backend.sh b/build/package-backend.sh
index 2a7983a4..03664381 100755
--- a/build/package-backend.sh
+++ b/build/package-backend.sh
@@ -1,4 +1,4 @@
-ROOT_DIR=glustermg-${VERSION}
+ROOT_DIR=glustermg-backend-${VERSION}
 DIR_NAME=${ROOT_DIR}/gmg-scripts
 TAR_NAME=${ROOT_DIR}.tar
 
diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index 692dec14..38196700 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -1,7 +1,7 @@
 WAR_NAME="glustermg.war"
 WAR_SCRIPTS_DIR=${WAR_NAME}/scripts
-NEW_WAR_NAME="glustermg-${VERSION}"
-TAR_NAME=${NEW_WAR_NAME}.war.tar
+NEW_WAR_NAME="glustermg"
+TAR_NAME=${NEW_WAR_NAME}-${VERSION}.war.tar
 SERVER_DIST_DIR="${WORKSPACE}/buckminster.output"
 
 prepare-dist-dir()
@@ -69,6 +69,7 @@ get-scripts()
 {
 	cp src/com.gluster.storage.management.gateway.scripts/src/common/* ${WAR_SCRIPTS_DIR}
 	cp src/com.gluster.storage.management.gateway.scripts/src/gateway/* ${WAR_SCRIPTS_DIR}
+	chmod +x ${WAR_SCRIPTS_DIR}/*
 }
 
 #---------------------------------------------