Skip to content

Commit

Permalink
Merge pull request #30 from basho-labs/rmf-2.0-rc
Browse files Browse the repository at this point in the history 
Updates for RMF 2.0.0 RC
  • Loading branch information
@sanmiguel
sanmiguel authored Dec 13, 2016
2 parents 9dcb420 + de6c21b commit ce7a6b6
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 468 deletions.
6 changes: 0 additions & 6 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
[submodule "framework/riak_explorer"]
path = framework/riak_explorer
url = https://github.com/basho-labs/riak_explorer.git
[submodule "riak/riak"]
path = riak/riak
url = https://github.com/basho/riak
[submodule "riak/riak_ee"]
path = riak/riak_ee
url = [email protected]:basho/riak_ee.git
[submodule "tools/riak-mesos-tools"]
path = tools/riak-mesos-tools
url = https://github.com/basho-labs/riak-mesos-tools
Expand Down
69 changes: 13 additions & 56 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
BASE_DIR = $(PWD)
DCOS_TEMPLATE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.dcos.template.json
DCOS_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.dcos.json
TOOLS_TEMPLATE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.template.json
TOOLS_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.example.json
TOOLS_LOCAL ?= $(BASE_DIR)/tools/riak-mesos-tools/config/config.local.json
REPO_TEMPLATE ?= $(BASE_DIR)/config/config.template.json
REPO_REMOTE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/config.json
TOOLS_VERSION_FILE ?= $(BASE_DIR)/tools/riak-mesos-tools/riak_mesos/constants.py
REPO_VERSION_FILE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/package.json
REPO_CMD_TEMPLATE ?= $(BASE_DIR)/config/command.template.json
REPO_CMD_FILE ?= $(BASE_DIR)/tools/riak-mesos-dcos-repo/repo/packages/R/riak/0/command.json
RIAK_KV_REMOTE ?= "https://github.com/basho-labs/riak-mesos/releases/download/2.0.0-rc1/riak-2.2.0-ubuntu-14.04.tar.gz"
RIAK_TS_REMOTE ?= "https://github.com/basho-labs/riak-mesos/releases/download/2.0.0-rc1/riak_ts-1.4.0-ubuntu-14.04.tar.gz"

.PHONY: all deps clean update-head

Expand All @@ -19,52 +13,22 @@ dev: deps tarball config
.config.packages:
cp $(TOOLS_TEMPLATE) $(TOOLS_REMOTE) && \
cp $(TOOLS_TEMPLATE) $(TOOLS_LOCAL) && \
cp $(REPO_TEMPLATE) $(REPO_REMOTE) && \
cp $(DCOS_TEMPLATE) $(DCOS_REMOTE) && \
sed -i "s,{{scheduler_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/remote.txt),g" $(TOOLS_REMOTE) && \
sed -i "s,{{scheduler_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/local.txt),g" $(TOOLS_LOCAL) && \
sed -i "s,{{scheduler_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/remote.txt),g" $(REPO_REMOTE) && \
sed -i "s,{{scheduler_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/remote.txt),g" $(DCOS_REMOTE) && \
sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/remote.txt),g" $(TOOLS_REMOTE) && \
sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt),g" $(TOOLS_LOCAL) && \
sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/remote.txt),g" $(REPO_REMOTE) && \
sed -i "s,{{executor_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/remote.txt),g" $(DCOS_REMOTE) && \
sed -i "s,{{node_url}},$(shell cat $(BASE_DIR)/riak/packages/remote.txt),g" $(TOOLS_REMOTE) && \
sed -i "s,{{node_url}},$(shell cat $(BASE_DIR)/riak/packages/local.txt),g" $(TOOLS_LOCAL) && \
sed -i "s,{{node_url}},$(shell cat $(BASE_DIR)/riak/packages/remote.txt),g" $(REPO_REMOTE) && \
sed -i "s,{{node_url}},$(shell cat $(BASE_DIR)/riak/packages/remote.txt),g" $(DCOS_REMOTE) && \
sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(TOOLS_REMOTE) && \
sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/local.txt),g" $(TOOLS_LOCAL) && \
sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(REPO_REMOTE) && \
sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(DCOS_REMOTE) && \
sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_remote.txt),g" $(TOOLS_REMOTE) && \
sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt),g" $(TOOLS_LOCAL)
sed -i "s,{{explorer_url}},$(shell cat $(BASE_DIR)/framework/riak_explorer/packages/remote.txt),g" $(TOOLS_REMOTE) && \
sed -i "s,{{explorer_url}},$(shell cat $(BASE_DIR)/framework/riak_explorer/packages/local.txt),g" $(TOOLS_LOCAL) && \
sed -i "s,{{explorer_url}},$(shell cat $(BASE_DIR)/framework/riak_explorer/packages/remote.txt),g" $(REPO_REMOTE) && \
sed -i "s,{{explorer_url}},$(shell cat $(BASE_DIR)/framework/riak_explorer/packages/remote.txt),g" $(DCOS_REMOTE) && \
sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_remote.txt),g" $(TOOLS_REMOTE) && \
sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt),g" $(TOOLS_LOCAL) && \
sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_remote.txt),g" $(REPO_REMOTE) && \
sed -i "s,{{patches_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_remote.txt),g" $(DCOS_REMOTE) && \
sed -i "s,{{patches_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt)),g" $(REPO_REMOTE) && \
sed -i "s,{{patches_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/patches_local.txt)),g" $(DCOS_REMOTE) && \
sed -i "s,{{explorer_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak_explorer/packages/local.txt)),g" $(REPO_REMOTE) && \
sed -i "s,{{explorer_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak_explorer/packages/local.txt)),g" $(DCOS_REMOTE) && \
sed -i "s,{{node_package}},$(shell basename $(shell cat $(BASE_DIR)/riak/packages/local.txt)),g" $(REPO_REMOTE) && \
sed -i "s,{{node_package}},$(shell basename $(shell cat $(BASE_DIR)/riak/packages/local.txt)),g" $(DCOS_REMOTE) && \
sed -i "s,{{executor_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt)),g" $(REPO_REMOTE) && \
sed -i "s,{{executor_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-executor/packages/local.txt)),g" $(DCOS_REMOTE) && \
sed -i "s,{{scheduler_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/local.txt)),g" $(REPO_REMOTE) && \
sed -i "s,{{scheduler_package}},$(shell basename $(shell cat $(BASE_DIR)/framework/riak-mesos-scheduler/packages/local.txt)),g" $(DCOS_REMOTE)
sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/remote.txt),g" $(TOOLS_REMOTE) && \
sed -i "s,{{director_url}},$(shell cat $(BASE_DIR)/framework/riak-mesos-director/packages/local.txt),g" $(TOOLS_LOCAL) && \
sed -i "s,{{riak_kv_2_2_url}},$(RIAK_KV_REMOTE),g" $(TOOLS_REMOTE) && \
sed -i "s,{{riak_kv_2_2_url}},$(RIAK_KV_REMOTE),g" $(TOOLS_LOCAL) && \
sed -i "s,{{riak_ts_1_4_url}},$(RIAK_TS_REMOTE),g" $(TOOLS_REMOTE) && \
sed -i "s,{{riak_ts_1_4_url}},$(RIAK_TS_REMOTE),g" $(TOOLS_LOCAL)
.config.version:
cp $(REPO_CMD_TEMPLATE) $(REPO_CMD_FILE) && \
sed -i "s,^version = .*$$,version = '$(shell git describe --tags --abbrev=0 | tr - .)',g" $(TOOLS_VERSION_FILE) && \
sed -i "s,\"version\": \".*\",\"version\": \"$(shell git describe --tags --abbrev=0 | tr - .)\",g" $(REPO_VERSION_FILE) && \
sed -i "s,{{tools_version}},$(shell cd tools/riak-mesos-tools && git rev-parse --abbrev-ref HEAD),g" $(REPO_CMD_FILE) && \
cd tools/riak-mesos-dcos-repo/scripts && \
./0-validate-version.sh && \
./1-validate-packages.sh && \
./2-build-index.sh && \
./3-validate-index.sh
cd tools/riak-mesos-dcos-repo/scripts && ./build.sh
config: .config.packages .config.version

.tarball.riak-mesos-scheduler:
Expand All @@ -80,10 +44,7 @@ config: .config.packages .config.version
cd $(BASE_DIR)/framework/riak_explorer && $(MAKE) tarball && \
touch ../../.tarball.riak_explorer
.tarball.framework: .tarball.riak-mesos-scheduler .tarball.riak-mesos-executor .tarball.riak-mesos-director .tarball.riak_explorer
.tarball.riak:
cd $(BASE_DIR)/riak && $(MAKE) tarball && \
touch ../.tarball.riak
tarball: .tarball.framework .tarball.riak
tarball: .tarball.framework

deps:
@if [ -z "$$(git submodule foreach ls)" ]; then \
Expand All @@ -95,10 +56,6 @@ clean-framework:
$(foreach dep,$(shell ls framework), \
cd $(BASE_DIR)/framework/$(dep) && \
$(MAKE) clean && rm -rf deps/* && rm -rf ebin/*.beam && git reset --hard HEAD;)
clean-riak:
-rm .tarball.riak
-rm -rf riak/$(RIAK_SOURCE_DIR)/deps/*
cd riak && $(MAKE) clean
clean: clean-framework

update-head:
Expand All @@ -107,4 +64,4 @@ update-head:
sync:
$(foreach dep,$(shell ls framework), \
cd $(BASE_DIR)/framework/$(dep) && $(MAKE) sync;)
cd $(BASE_DIR)/riak && make sync

4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Preview available at [basho-labs.github.io/riak-mesos](http://basho-labs.github.

The Riak Mesos Framework supports the following environments:

- Riak KV v2.1.4 (See [here](https://github.com/basho-labs/riak-mesos/releases) for supported packages)
- Riak TS v1.3.1 (See [here](https://github.com/basho-labs/riak-mesos/releases) for supported packages)
- Riak KV v2.2.0 (See [here](https://github.com/basho-labs/riak-mesos/releases) for supported packages)
- Riak TS v1.4.0 (See [here](https://github.com/basho-labs/riak-mesos/releases) for supported packages)
- Mesos version:
- v0.28
- v1.0
Expand Down
5 changes: 0 additions & 5 deletions config/command.template.json
View file

This file was deleted.

Loading

0 comments on commit ce7a6b6

Please sign in to comment.