From 63e4a2e51d34a5c38431cdb8499b16997e8c2dac Mon Sep 17 00:00:00 2001 From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl> Date: Sat, 25 Mar 2017 11:42:59 +0100 Subject: [PATCH] meta --- cass_zk_rmq/build.sh | 2 -- czr_pythons/build.sh | 30 ++++-------------------------- make.py | 3 +-- 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/cass_zk_rmq/build.sh b/cass_zk_rmq/build.sh index 50f2b45..c5749e9 100644 --- a/cass_zk_rmq/build.sh +++ b/cass_zk_rmq/build.sh @@ -3,5 +3,3 @@ bash boxen/cassandra/build.sh bash wynurz.sh zookeeeper bash wynurz.sh rabbitmq - - diff --git a/czr_pythons/build.sh b/czr_pythons/build.sh index 49a3b98..12f90e7 100644 --- a/czr_pythons/build.sh +++ b/czr_pythons/build.sh @@ -4,32 +4,10 @@ pip install --upgrade pip==1.5.6 pip install --upgrade setuptools==5.5.1 - -# Oracle Java JRE -apt-get install -y debconf-utils -echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" > /etc/apt/sources.list.d/webupd8team-java.list -echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" >> /etc/apt/sources.list.d/webupd8team-java.list -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 -apt-get update -echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections -apt-get install -y oracle-java8-installer - -# Install Apache Cassandra -echo "deb http://debian.datastax.com/community stable main" > /etc/apt/sources.list.d/cassandra.sources.list -curl -L http://debian.datastax.com/debian/repo_key | apt-key add - -apt-get update -apt-get install -y cassandra=3.0.9 dsc30 cassandra-tools - # Install RabbitMQ -apt-get install -y rabbitmq-server=3.3.5-1.1 - -service rabbitmq-server stop - -# Install ZooKeeper -apt-get install -y zookeeper zookeeperd - -service zookeeper stop -bash assaassinate_cassandra.sh +$(bash wynurz.sh java && +bash wynurz.sh cassandra && +bash wynurz.sh rabbitmq && +bash wynurz.sh zookeeper) & -# Python modules pip install cassandra-driver kazoo CoolAMQP requests futures six monotonic nose mock diff --git a/make.py b/make.py index d52c923..9e764e3 100644 --- a/make.py +++ b/make.py @@ -41,8 +41,7 @@ build_$BOX: - cd .. '''.replace('$BOX', box).replace('$PREFIX', 'henrietta/')) - if sys.argv[1] == 'meta': - + if ' '.join(sys.argv).endswith('meta'): with open('DESCRIPTION', 'rb') as mdin, open('metadata.json', 'wb') as mdout: description = mdin.read().strip() -- GitLab