Merge branch 'master' of github.com:gluster/console

4 files changed, 18 insertions, 19 deletions

diff --git a/build/create-rpms.sh b/build/create-rpms.sh
index 62b5fd42..b02ae91e 100755
--- a/build/create-rpms.sh
+++ b/build/create-rpms.sh
@@ -1,6 +1,9 @@
-cp glustermg-1.0.0.tar.gz /usr/src/redhat/SOURCES
-rpmbuild -bb build/glustermg.spec
-rm -rf rpms
-mkdir rpms
-mv /usr/src/redhat/RPMS/x86_64/glustermg*.rpm rpms
-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 836a011f..7e7eb533 100644
--- a/build/glustermg.spec
+++ b/build/glustermg.spec
@@ -1,7 +1,4 @@
-%define glustermg_war_url http://build.gluster.com:8080/job/glustermg-package/lastSuccessfulBuild/artifact/glustermg.war.tar.gz
-
 %define product_family Gluster Management Gateway
-%define release_version 1.0.0
 
 %define current_arch %{_arch}
 %ifarch i386
@@ -14,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
@@ -40,7 +37,7 @@ Requires:       libxml2 >= 2.6.26
 
 
 %prep
-%setup -q -n glustermg-%{release_version}
+%setup -q -n glustermg-backend-%{release_version}
 
 %build
 
@@ -50,9 +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
-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 %{_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 efc53b0e..03664381 100755
--- a/build/package-backend.sh
+++ b/build/package-backend.sh
@@ -1,4 +1,4 @@
-ROOT_DIR=glustermg-1.0.0
+ROOT_DIR=glustermg-backend-${VERSION}
 DIR_NAME=${ROOT_DIR}/gmg-scripts
 TAR_NAME=${ROOT_DIR}.tar
 
@@ -22,7 +22,7 @@ get-scripts()
 #---------------------------------------------
 # Main Action Body
 #---------------------------------------------
-echo "Packaging Gluster Management Console Scripts..."
+echo "Packaging Gluster Management Gateway Back-end Scripts..."
 
 prepare-script-dir
 get-scripts
diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index e598e92c..640f69d5 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -1,8 +1,8 @@
 WAR_NAME="glustermg.war"
 WAR_SCRIPTS_DIR=${WAR_NAME}/scripts
 NEW_WAR_NAME="glustermg"
-TAR_NAME=${WAR_NAME}.tar
-SERVER_DIST_DIR="${WORKSPACE}/../../glustermg/lastSuccessful"
+TAR_NAME=${NEW_WAR_NAME}-${VERSION}.war.tar
+SERVER_DIST_DIR="${WORKSPACE}/buckminster.output"
 
 prepare-dist-dir()
 {
@@ -48,7 +48,7 @@ get-dist()
 	OS=${2}
 	WS=${3}
 
-	OUT_DIR="${WORKSPACE}/../../glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.console.feature.webstart*.feature/glustermc"
+	OUT_DIR="${WORKSPACE}/../../${VERSION}-glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.console.feature.webstart*.feature/glustermc"
 	NEW_DIR=${WAR_NAME}/${OS}.${WS}.${ARCH}
 	cp -R ${OUT_DIR} ${NEW_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}/*
 }
 
 #---------------------------------------------