From 1b6c81d0ebe6d469fc3f1dad909724f99523b30f Mon Sep 17 00:00:00 2001 From: Marco Mariani Date: Fri, 17 Oct 2014 14:42:52 +0200 Subject: [PATCH] hadoop-demo: updated and tested SR; moved to software/unstable --- .../hadoop-demo/gutenberg/data-download.sh | 0 software/{ => unstable}/hadoop-demo/gutenberg/mapper.py | 0 .../hadoop-demo/gutenberg/put-files.sh.in | 0 .../{ => unstable}/hadoop-demo/gutenberg/reducer.py | 0 software/{ => unstable}/hadoop-demo/gutenberg/run.sh.in | 0 software/{ => unstable}/hadoop-demo/instance.cfg.in | 0 software/{ => unstable}/hadoop-demo/software.cfg | 11 +++++++++-- .../hadoop-demo/wikipedia/data-download.sh | 0 software/{ => unstable}/hadoop-demo/wikipedia/mapper.py | 0 .../hadoop-demo/wikipedia/put-files.sh.in | 0 .../{ => unstable}/hadoop-demo/wikipedia/reducer.py | 0 software/{ => unstable}/hadoop-demo/wikipedia/run.sh.in | 0 stack/hadoop/buildout.cfg | 17 ++++++++++++----- stack/hadoop/instance-stack.cfg.in | 2 +- 14 files changed, 22 insertions(+), 8 deletions(-) rename software/{ => unstable}/hadoop-demo/gutenberg/data-download.sh (100%) rename software/{ => unstable}/hadoop-demo/gutenberg/mapper.py (100%) rename software/{ => unstable}/hadoop-demo/gutenberg/put-files.sh.in (100%) rename software/{ => unstable}/hadoop-demo/gutenberg/reducer.py (100%) rename software/{ => unstable}/hadoop-demo/gutenberg/run.sh.in (100%) rename software/{ => unstable}/hadoop-demo/instance.cfg.in (100%) rename software/{ => unstable}/hadoop-demo/software.cfg (60%) rename software/{ => unstable}/hadoop-demo/wikipedia/data-download.sh (100%) rename software/{ => unstable}/hadoop-demo/wikipedia/mapper.py (100%) rename software/{ => unstable}/hadoop-demo/wikipedia/put-files.sh.in (100%) rename software/{ => unstable}/hadoop-demo/wikipedia/reducer.py (100%) rename software/{ => unstable}/hadoop-demo/wikipedia/run.sh.in (100%) diff --git a/software/hadoop-demo/gutenberg/data-download.sh b/software/unstable/hadoop-demo/gutenberg/data-download.sh similarity index 100% rename from software/hadoop-demo/gutenberg/data-download.sh rename to software/unstable/hadoop-demo/gutenberg/data-download.sh diff --git a/software/hadoop-demo/gutenberg/mapper.py b/software/unstable/hadoop-demo/gutenberg/mapper.py similarity index 100% rename from software/hadoop-demo/gutenberg/mapper.py rename to software/unstable/hadoop-demo/gutenberg/mapper.py diff --git a/software/hadoop-demo/gutenberg/put-files.sh.in b/software/unstable/hadoop-demo/gutenberg/put-files.sh.in similarity index 100% rename from software/hadoop-demo/gutenberg/put-files.sh.in rename to software/unstable/hadoop-demo/gutenberg/put-files.sh.in diff --git a/software/hadoop-demo/gutenberg/reducer.py b/software/unstable/hadoop-demo/gutenberg/reducer.py similarity index 100% rename from software/hadoop-demo/gutenberg/reducer.py rename to software/unstable/hadoop-demo/gutenberg/reducer.py diff --git a/software/hadoop-demo/gutenberg/run.sh.in b/software/unstable/hadoop-demo/gutenberg/run.sh.in similarity index 100% rename from software/hadoop-demo/gutenberg/run.sh.in rename to software/unstable/hadoop-demo/gutenberg/run.sh.in diff --git a/software/hadoop-demo/instance.cfg.in b/software/unstable/hadoop-demo/instance.cfg.in similarity index 100% rename from software/hadoop-demo/instance.cfg.in rename to software/unstable/hadoop-demo/instance.cfg.in diff --git a/software/hadoop-demo/software.cfg b/software/unstable/hadoop-demo/software.cfg similarity index 60% rename from software/hadoop-demo/software.cfg rename to software/unstable/hadoop-demo/software.cfg index 182d791..2e1c83e 100644 --- a/software/hadoop-demo/software.cfg +++ b/software/unstable/hadoop-demo/software.cfg @@ -1,10 +1,12 @@ [buildout] extends = - ../../stack/hadoop/buildout.cfg + ../../../stack/hadoop/buildout.cfg parts = slapos-cookbook + libffi + python-cffi eggs java hadoop @@ -13,7 +15,6 @@ parts = instance - [instance] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg.in @@ -22,3 +23,9 @@ output = ${buildout:directory}/instance.cfg mode = 0644 +[versions] +collective.recipe.template = 1.11 +cp.recipe.cmd = 0.5nxd001 +plone.recipe.command = 1.1 +slapos.recipe.template = 2.5 + diff --git a/software/hadoop-demo/wikipedia/data-download.sh b/software/unstable/hadoop-demo/wikipedia/data-download.sh similarity index 100% rename from software/hadoop-demo/wikipedia/data-download.sh rename to software/unstable/hadoop-demo/wikipedia/data-download.sh diff --git a/software/hadoop-demo/wikipedia/mapper.py b/software/unstable/hadoop-demo/wikipedia/mapper.py similarity index 100% rename from software/hadoop-demo/wikipedia/mapper.py rename to software/unstable/hadoop-demo/wikipedia/mapper.py diff --git a/software/hadoop-demo/wikipedia/put-files.sh.in b/software/unstable/hadoop-demo/wikipedia/put-files.sh.in similarity index 100% rename from software/hadoop-demo/wikipedia/put-files.sh.in rename to software/unstable/hadoop-demo/wikipedia/put-files.sh.in diff --git a/software/hadoop-demo/wikipedia/reducer.py b/software/unstable/hadoop-demo/wikipedia/reducer.py similarity index 100% rename from software/hadoop-demo/wikipedia/reducer.py rename to software/unstable/hadoop-demo/wikipedia/reducer.py diff --git a/software/hadoop-demo/wikipedia/run.sh.in b/software/unstable/hadoop-demo/wikipedia/run.sh.in similarity index 100% rename from software/hadoop-demo/wikipedia/run.sh.in rename to software/unstable/hadoop-demo/wikipedia/run.sh.in diff --git a/stack/hadoop/buildout.cfg b/stack/hadoop/buildout.cfg index fc81dd2..09c9346 100644 --- a/stack/hadoop/buildout.cfg +++ b/stack/hadoop/buildout.cfg @@ -2,10 +2,16 @@ extends = ../../stack/slapos.cfg + ../../component/libffi/buildout.cfg + ../../component/pkgconfig/buildout.cfg + ../../component/python-cffi/buildout.cfg ../../component/java/buildout.cfg + parts = slapos-cookbook + libffi + python-cffi eggs java hadoop @@ -24,9 +30,10 @@ eggs = [hadoop] recipe = hexagonit.recipe.download -filename = hadoop-2.2.0.tar.gz -url = http://apache.mirrors.spacedump.net/hadoop/common/stable/${:filename} -md5sum = 25f27eb0b5617e47c032319c0bfd9962 +version = 2.5.1 +filename = hadoop-${:version}.tar.gz +url = http://apache.mirrors.spacedump.net/hadoop/common/hadoop-${:version}/${:filename} +md5sum = 015b12d790701deb4de9a647013f72a9 download-only = true mode = 0644 strip-top-level-dir = true @@ -36,7 +43,7 @@ strip-top-level-dir = true recipe = hexagonit.recipe.download url = http://repo1.maven.org/maven2/org/apache/hadoop/hadoop-streaming/0.20.203.0/hadoop-streaming-0.20.203.0.jar download-only = true -#md5sum = +md5sum = 792c7df75b63e477fef12988b7cced6f mode = 0644 @@ -44,7 +51,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-stack.cfg.in output = ${buildout:directory}/instance-stack.cfg -# md5sum = +md5sum = 3c846dd1269aeef43cd2d5448463563b mode = 0644 diff --git a/stack/hadoop/instance-stack.cfg.in b/stack/hadoop/instance-stack.cfg.in index 5f0844b..bf64797 100644 --- a/stack/hadoop/instance-stack.cfg.in +++ b/stack/hadoop/instance-stack.cfg.in @@ -46,6 +46,6 @@ promises = $${directories:etc}/promise recipe = slapos.recipe.template url = ${:_profile_base_location_}/template/start-daemons.sh.in output = $${directories:bin}/start-daemons.sh -# md5sum = +md5sum = 35a51a7f826d29e47c564c57e954db80 mode = 0755 -- 2.1.4