Commit 51b8e4e0 authored by Paul Rich's avatar Paul Rich
Browse files

Selective rebuild and update variables should work now.

parent 21b7381a
......@@ -85,5 +85,11 @@ Vagrant.configure("2") do |config|
config.vm.provision "file", source: "bash_profile", destination: "$HOME/.bash_profile"
config.vm.provision "file", source: "README.md", destination: "$HOME/README.md"
config.vm.provision "shell", path: "provision-root.sh", name: "ROOT PROVISION"
config.vm.provision "shell", path: "provision-vagrant.sh", name: "VAGRANT USER PROVISION", privileged: false
config.vm.provision "shell", path: "provision-vagrant.sh", name: "VAGRANT USER PROVISION", privileged: false, env:
{ "UPDATE_PMIX" => ENV["UPDATE_PMIX"],
"UPDATE_PRRTE" => ENV["UPDATE_PRRTE"],
"REBUILD_PMIX" => ENV["REBUILD_PMIX"],
"REBUILD_PRRTE" => ENV["REBUILD_PRRTE"],
"UPDATE_ALL" => ENV["UPDATE_ALL"],
"REBUILD_ALL" => ENV["REBUILD_ALL"] }
end
......@@ -2,7 +2,11 @@
# Provision script for Mesos VM CentOS7 environment
# These are intended to run as the vagrant user.
if [ REBUILD_ALL ]; then
if [ ! -z "$UPDATE_ALL" ]; then
UPDATE_PMIX=1
UPDATE_PRRTE=1
fi
if [ ! -z "$REBUILD_ALL" ]; then
REBUILD_PMIX=1
REBUILD_PRRTE=1
fi
......@@ -10,14 +14,14 @@ if [ ! -d pmix ]; then
git clone https://github.com/pmix/pmix
REBUILD_PMIX=1
fi
if [ $UPDATE_PMIX ]; then
if [ ! -z "$UPDATE_PMIX" ]; then
cd pmix
git fetch --all
git pull master
cd -
REBUILD_PMIX=1
fi
if [ $REBUILD_PMIX ]; then
if [ ! -z "$REBUILD_PMIX" ]; then
cd pmix
./autogen.pl
./configure
......@@ -29,14 +33,14 @@ if [ ! -d prrte ]; then
git clone https://github.com/pmix/prrte
REBUILD_PRRTE=1
fi
if [ $UPDATE_PRRTE ]; then
if [ ! -z "$UPDATE_PRRTE" ]; then
cd prrte
git fetch --all
git pull master
cd -
REBUILD_PRRTE=1
fi
if [ $REBUILD_PMIX ]; then
if [ ! -z "$REBUILD_PRRTE" ]; then
cd prrte
./autogen.pl
./configure --enable-debug --with-pmix=/usr/local
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment