You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/03/05 22:45:56 UTC
svn commit: r1297237 - in /incubator/bigtop/trunk: ./
bigtop-packages/src/common/oozie/ bigtop-packages/src/deb/oozie/
bigtop-packages/src/rpm/oozie/SPECS/
Author: rvs
Date: Mon Mar 5 21:45:55 2012
New Revision: 1297237
URL: http://svn.apache.org/viewvc?rev=1297237&view=rev
Log:
BIGTOP-424. Bump version of Oozie to 3.1.3
Removed:
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie-examples.sh
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie-env.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst
incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postrm
incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
incubator/bigtop/trunk/bigtop.mk
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build?rev=1297237&r1=1297236&r2=1297237&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build Mon Mar 5 21:45:55 2012
@@ -14,13 +14,13 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
+set -x
#
# Resolve source directory
#
# $0 may be a softlink
-PRG="${0}"
+PRG="$0"
while [ -h "${PRG}" ]; do
ls=`ls -ld "${PRG}"`
link=`expr "$ls" : '.*-> \(.*\)$'`
@@ -34,10 +34,12 @@ done
RELEASE_DIR=`dirname ${PRG}`
RELEASE_DIR=`cd ${RELEASE_DIR}/..;pwd`
+RELEASE_DIR=$PWD
+
#
# Resolve build version
#
-OOZIE_VERSION=2.3.0
+OOZIE_VERSION=3.1.3-incubating
RELEASE_ENV_FILENAME=release.env
RELEASE_ENV_FILE=${RELEASE_DIR}/cloudera/${RELEASE_ENV_FILENAME}
if [ -f "${RELEASE_ENV_FILE}" ]; then
@@ -84,7 +86,7 @@ if [ "${DO_MAVEN_DEPLOY}" = "deploy" ];
fi
# Invoke Oozie build script with CDH options
-${WORKDIR}/bin/mkdistro.sh -DskipTests -Dnot.cdh.release.build=false ${EXTRA_GOALS} "$@"
+${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=1.0.0 ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
MKDISTRO_RESULT=$?
if [ "${MKDISTRO_RESULT}" != "0" ]; then
echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"
@@ -115,10 +117,6 @@ fi
cd ${EXPDIR}
rm -rf ${EXPDIR}/oozie-client-*.tar.gz
-# creating the examples installer script for TAR distros, if doing DEB/RPM the script
-# is overriden in the create-package-layout directory
-cp ${RELEASE_DIR}/cloudera/oozie-examples.sh ${EXPDIR}/bin/
-
SRCDIR=${EXPDIR}/src
mkdir -p ${SRCDIR}
for srcfile in ${WORKDIR}/*
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh?rev=1297237&r1=1297236&r2=1297237&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh Mon Mar 5 21:45:55 2012
@@ -151,8 +151,6 @@ install -d -m 0755 ${OOZIE_MAN_DIR}
failIfNotOK
gzip -c ${EXTRADIR}/oozie.1 > ${OOZIE_MAN_DIR}/oozie.1.gz
failIfNotOK
-cp -R ${EXTRADIR}/oozie-examples.sh ${OOZIE_CLIENT_DIR}/bin
-failIfNotOK
# Create the /usr/bin/oozie wrapper
install -d -m 0755 $BIN_DIR
@@ -202,8 +200,10 @@ failIfNotOK
install -d -m 0755 ${OOZIE_DATA}
failIfNotOK
cp -R ${OOZIE_BUILD_DIR}/bin/*.sh ${OOZIE_SERVER_DIR}/bin
-
failIfNotOK
+cp -R ${OOZIE_BUILD_DIR}/libtools ${OOZIE_SERVER_DIR}
+failIfNotOK
+
install -d -m 0755 ${OOZIE_CONF}
failIfNotOK
cp -R ${OOZIE_BUILD_DIR}/conf/* ${OOZIE_CONF}
@@ -218,18 +218,31 @@ if [ "${OOZIE_INITD}" != "" ]; then
fi
cp -R ${OOZIE_BUILD_DIR}/oozie-sharelib*.tar.gz ${OOZIE_SERVER_DIR}/oozie-sharelib.tar.gz
failIfNotOK
-cp -R ${OOZIE_BUILD_DIR}/oozie.war ${OOZIE_SERVER_DIR}
-failIfNotOK
-cp -R ${OOZIE_BUILD_DIR}/oozie-server ${OOZIE_SERVER_DIR}
-failIfNotOK
install -d -m 0755 ${OOZIE_DATA}/oozie-server
failIfNotOK
-mv ${OOZIE_SERVER_DIR}/oozie-server/conf ${OOZIE_DATA}/oozie-server/
+cp -R ${OOZIE_BUILD_DIR}/oozie-server/conf ${OOZIE_DATA}/oozie-server/conf
failIfNotOK
-mv ${OOZIE_SERVER_DIR}/oozie-server/webapps ${OOZIE_DATA}/oozie-server/
+cp -R ${OOZIE_BUILD_DIR}/oozie-server/webapps ${OOZIE_SERVER_DIR}/webapps
failIfNotOK
cp -R ${EXTRADIR}/oozie-env.sh ${OOZIE_SERVER_DIR}/bin
failIfNotOK
chmod 755 ${OOZIE_SERVER_DIR}/bin/oozie-env.sh
failIfNotOK
+# Unpack oozie.war some place reasonable
+OOZIE_WEBAPP=${OOZIE_SERVER_DIR}/webapps/oozie
+mkdir ${OOZIE_WEBAPP}
+unzip -d ${OOZIE_WEBAPP} ${OOZIE_BUILD_DIR}/oozie.war
+touch ${OOZIE_SERVER_DIR}/webapps/oozie.war
+
+# Create an exploded-war oozie deployment in /var/lib/oozie
+sed -i -e 's#<Context#<Context allowLinking="true"#g' ${OOZIE_DATA}/oozie-server/conf/context.xml
+mkdir ${OOZIE_DATA}/oozie-server/lib
+ln -s /usr/lib/oozie/webapps ${OOZIE_DATA}/oozie-server/webapps
+
+# Finally do a trick where all the libs go to a writable place
+mv -f ${OOZIE_WEBAPP}/WEB-INF/lib ${OOZIE_DATA}/oozie-libs
+ln -s /var/lib/oozie/oozie-libs ${OOZIE_WEBAPP}/WEB-INF/lib
+for i in `cd ${OOZIE_SERVER_DIR} ; echo lib/* libtools/*` ; do
+ ln -fs /usr/lib/oozie/$i ${OOZIE_DATA}/oozie-libs/${i#*/}
+done
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie-env.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie-env.sh?rev=1297237&r1=1297236&r2=1297237&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie-env.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie-env.sh Mon Mar 5 21:45:55 2012
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-export OOZIE_CONFIG=/etc/oozie
+export OOZIE_CONFIG=/etc/oozie/conf
export OOZIE_DATA=/var/lib/oozie
export OOZIE_LOG=/var/log/oozie
export CATALINA_BASE=${OOZIE_DATA}/oozie-server
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst?rev=1297237&r1=1297236&r2=1297237&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postinst Mon Mar 5 21:45:55 2012
@@ -38,7 +38,6 @@ case "$1" in
configure)
chown -R oozie:oozie /var/lib/oozie /var/log/oozie
update-rc.d oozie defaults >/dev/null || exit 1
- /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postrm
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postrm?rev=1297237&r1=1297236&r2=1297237&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postrm (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/oozie.postrm Mon Mar 5 21:45:55 2012
@@ -37,11 +37,6 @@ set -e
case "$1" in
purge)
- rm -rf /etc/oozie
- rm -rf /var/lib/oozie
- rm -rf /var/run/oozie
- rm -rf /var/tmp/oozie
- rm -rf /var/log/oozie
update-rc.d -f oozie remove > /dev/null || exit 1
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules?rev=1297237&r1=1297236&r2=1297237&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules Mon Mar 5 21:45:55 2012
@@ -23,12 +23,6 @@ export DH_VERBOSE=1
# This has to be exported to make some magic below work.
export DH_OPTIONS
-ifneq "$(wildcard ${HOME}/.m2/settings.xml)" ""
- m2_settings_flag=--settings ${HOME}/.m2/settings.xml
-else
- m2_settings_flag=
-endif
-
patch: patch-stamp
patch-stamp:
touch $@
@@ -47,10 +41,8 @@ clean:
build-indep: build-indep-stamp
build-indep-stamp: patch-stamp
-# M2_CACHE=`mktemp -d /tmp/oozie.m2.XXXXX`
mkdir -p distro/downloads
- (export DO_MAVEN_DEPLOY=""; export FULL_VERSION=2.3.1; sh -x debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository ${m2_settings_flag} -DskipTests)
-# rm -rf ${M2_CACHE}
+ env DO_MAVEN_DEPLOY="" FULL_VERSION=${OOZIE_BASE_VERSION} bash -x debian/do-component-build
mkdir -p debian/tmp
tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
touch $@
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1297237&r1=1297236&r2=1297237&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Mon Mar 5 21:45:55 2012
@@ -24,6 +24,22 @@
%define initd_dir %{_sysconfdir}/rc.d/init.d
%define alternatives_cmd alternatives
%else
+
+# Only tested on openSUSE 11.4. le'ts update it for previous release when confirmed
+%if 0%{suse_version} > 1130
+%define suse_check \# Define an empty suse_check for compatibility with older sles
+%endif
+
+# SLES is more strict anc check all symlinks point to valid path
+# But we do point to a hadoop jar which is not there at build time
+# (but would be at install time).
+# Since our package build system does not handle dependencies,
+# these symlink checks are deactivated
+%define __os_install_post \
+ %{suse_check} ; \
+ /usr/lib/rpm/brp-compress ; \
+ %{nil}
+
%define doc_oozie %{_docdir}/oozie
%define initd_dir %{_sysconfdir}/rc.d
%define alternatives_cmd update-alternatives
@@ -39,7 +55,10 @@ Buildroot: %{_topdir}/INSTALL/%{name}-%{
License: APL2
Source0: %{name}-%{oozie_base_version}.tar.gz
Source1: do-component-build
-Source2: install_oozie.sh
+Source2: install_oozie.sh
+Source3: oozie.1
+Source4: oozie-env.sh
+Source5: oozie.init
Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
Requires(post): /sbin/chkconfig, hadoop
Requires(preun): /sbin/chkconfig, /sbin/service
@@ -107,14 +126,11 @@ Requires: bigtop-utils
%prep
-%setup -n yahoo-oozie-39697f6
+%setup -n oozie-%{oozie_base_version}
%build
- M2_CACHE=`mktemp -d /tmp/oozie.m2.XXXXX`
mkdir -p distro/downloads
- # curl --retry 5 -# -L -k -o distro/downloads/tomcat.tar.gz http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.tar.gz
- (export DO_MAVEN_DEPLOY="";export FULL_VERSION=%{version};cp %{SOURCE1} bin; sh -x bin/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository -DskipTests)
- rm -rf ${M2_CACHE}
+ env DO_MAVEN_DEPLOY="" FULL_VERSION=%{oozie_base_version} bash -x %{SOURCE1}
%install
%__rm -rf $RPM_BUILD_ROOT
@@ -130,7 +146,6 @@ getent group oozie >/dev/null || /usr/sb
getent passwd oozie >/dev/null || /usr/sbin/useradd --comment "Oozie User" --shell /bin/false -M -r -g oozie --home /var/run/oozie oozie >/dev/null
%post
-%{lib_oozie}/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop
/sbin/chkconfig --add oozie
%preun
@@ -162,7 +177,9 @@ fi
%{lib_oozie}/bin/oozie-sys.sh
%{lib_oozie}/bin/oozie-env.sh
%{lib_oozie}/bin/oozied.sh
-%{lib_oozie}/oozie.war
+%{lib_oozie}/bin/ooziedb.sh
+%{lib_oozie}/webapps
+%{lib_oozie}/libtools
%{lib_oozie}/oozie-sharelib.tar.gz
%{lib_oozie}/oozie-server
%{initd_dir}/oozie
@@ -177,7 +194,6 @@ fi
%{usr_bin}/oozie
%dir %{lib_oozie}/bin
%{lib_oozie}/bin/oozie
-%{lib_oozie}/bin/oozie-examples.sh
%{lib_oozie}/lib
%doc %{doc_oozie}
%{man_dir}/man1/oozie.1.*
Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1297237&r1=1297236&r2=1297237&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Mon Mar 5 21:45:55 2012
@@ -91,12 +91,12 @@ $(eval $(call PACKAGE,sqoop,SQOOP))
OOZIE_NAME=oozie
OOZIE_RELNOTES_NAME=Apache Oozie
OOZIE_PKG_NAME=oozie
-OOZIE_BASE_VERSION=2.3.2
-OOZIE_PKG_VERSION=2.3.2
+OOZIE_BASE_VERSION=3.1.3-incubating
+OOZIE_PKG_VERSION=3.1.3
OOZIE_RELEASE_VERSION=1
-OOZIE_TARBALL_DST=oozie-2.3.2.tar.gz
-OOZIE_TARBALL_SRC=2.3.2
-OOZIE_SITE=http://github.com/yahoo/oozie/tarball
+OOZIE_TARBALL_DST=oozie-$(OOZIE_BASE_VERSION).tar.gz
+OOZIE_TARBALL_SRC=oozie-$(OOZIE_BASE_VERSION)-src.tar.gz
+OOZIE_SITE=$(APACHE_MIRROR)/incubator/$(OOZIE_NAME)/$(OOZIE_NAME)-$(OOZIE_BASE_VERSION)/
$(eval $(call PACKAGE,oozie,OOZIE))
# Whirr