From e42653220ded7a1d1acf84bf837bf1b0165dbb45 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Wed, 31 Aug 2011 15:55:53 +0530 Subject: Modified the scripts to take release version from env variable VERSION --- build/create-rpms.sh | 4 ++-- build/glustermg.spec | 5 ++++- build/package-backend.sh | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'build') diff --git a/build/create-rpms.sh b/build/create-rpms.sh index 62b5fd42..21bfa531 100755 --- a/build/create-rpms.sh +++ b/build/create-rpms.sh @@ -1,5 +1,5 @@ -cp glustermg-1.0.0.tar.gz /usr/src/redhat/SOURCES -rpmbuild -bb build/glustermg.spec +cp glustermg-${VERSION}.tar.gz /usr/src/redhat/SOURCES +rpmbuild --define "release_version ${VERSION}" -bb build/glustermg.spec rm -rf rpms mkdir rpms mv /usr/src/redhat/RPMS/x86_64/glustermg*.rpm rpms diff --git a/build/glustermg.spec b/build/glustermg.spec index 836a011f..27662f88 100644 --- a/build/glustermg.spec +++ b/build/glustermg.spec @@ -1,7 +1,10 @@ %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 + +# 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 diff --git a/build/package-backend.sh b/build/package-backend.sh index efc53b0e..cb435dde 100755 --- a/build/package-backend.sh +++ b/build/package-backend.sh @@ -1,4 +1,4 @@ -ROOT_DIR=glustermg-1.0.0 +ROOT_DIR=glustermg-${VERSION} DIR_NAME=${ROOT_DIR}/gmg-scripts TAR_NAME=${ROOT_DIR}.tar -- cgit From d2277e6c4391f38f6373872df1a2911d86aa587d Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Wed, 31 Aug 2011 16:37:26 +0530 Subject: Modified RPM build to pick up the glustermg.war.tar.gz from current directory instead of the last successful build url --- build/glustermg.spec | 15 +++++++++++---- build/package-backend.sh | 2 +- build/package-gateway.sh | 6 +++--- 3 files changed, 15 insertions(+), 8 deletions(-) (limited to 'build') diff --git a/build/glustermg.spec b/build/glustermg.spec index 27662f88..30dd79aa 100644 --- a/build/glustermg.spec +++ b/build/glustermg.spec @@ -1,4 +1,5 @@ -%define glustermg_war_url http://build.gluster.com:8080/job/glustermg-package/lastSuccessfulBuild/artifact/glustermg.war.tar.gz +# 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 @@ -53,9 +54,15 @@ 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 + +# 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-${VERSION}.war.tar.gz +rm -f glustermg-${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 cb435dde..2a7983a4 100755 --- a/build/package-backend.sh +++ b/build/package-backend.sh @@ -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..a26c8006 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" +NEW_WAR_NAME="glustermg-${VERSION}" +TAR_NAME=${NEW_WAR_NAME}.tar +SERVER_DIST_DIR="${WORKSPACE}/buckminster.output" prepare-dist-dir() { -- cgit From f4246a48ed0deacdd377e5f0c34e8671f14222f6 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Wed, 31 Aug 2011 17:16:34 +0530 Subject: Modified to run all commands as sudo --- build/create-rpms.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'build') diff --git a/build/create-rpms.sh b/build/create-rpms.sh index 21bfa531..f74902d3 100755 --- a/build/create-rpms.sh +++ b/build/create-rpms.sh @@ -1,6 +1,6 @@ -cp glustermg-${VERSION}.tar.gz /usr/src/redhat/SOURCES -rpmbuild --define "release_version ${VERSION}" -bb build/glustermg.spec -rm -rf rpms -mkdir rpms -mv /usr/src/redhat/RPMS/x86_64/glustermg*.rpm rpms -chown -R jenkins:jenkins rpms +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 -- cgit From bea8fb354ba354c4606309661c46bda3d3939673 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Wed, 31 Aug 2011 17:48:15 +0530 Subject: Corrected variable name from VERSION to release_version --- build/glustermg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/glustermg.spec b/build/glustermg.spec index 30dd79aa..db8e9d7c 100644 --- a/build/glustermg.spec +++ b/build/glustermg.spec @@ -60,7 +60,7 @@ mkdir -p $RPM_BUILD_ROOT/var/log/glustermg # 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-${VERSION}.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 %{__install} -d -m0755 %{buildroot}%{_bindir} -- cgit From 854934135a838392bc00e1f6a32a92dbbfca77be Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Wed, 31 Aug 2011 18:13:48 +0530 Subject: Modified to correct the output tar name --- build/package-gateway.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/package-gateway.sh b/build/package-gateway.sh index a26c8006..692dec14 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}.tar +TAR_NAME=${NEW_WAR_NAME}.war.tar SERVER_DIST_DIR="${WORKSPACE}/buckminster.output" prepare-dist-dir() -- cgit From 326cd3ab76711f8753cd94d9bc359e6612d1bc1e Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Fri, 2 Sep 2011 13:26:25 +0530 Subject: 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' --- build/create-rpms.sh | 15 +++++++++------ build/glustermg.spec | 21 +++------------------ build/package-backend.sh | 2 +- build/package-gateway.sh | 5 +++-- 4 files changed, 16 insertions(+), 27 deletions(-) (limited to 'build') 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}/* } #--------------------------------------------- -- cgit From 31350432cdd7ebf94d567052125e0f411fd91921 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Fri, 2 Sep 2011 18:17:44 +0530 Subject: Modified to pick the console distributions from the correct job (-glustermc) --- build/package-gateway.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/package-gateway.sh b/build/package-gateway.sh index 38196700..640f69d5 100755 --- a/build/package-gateway.sh +++ b/build/package-gateway.sh @@ -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} -- cgit