Commit a01b9897 authored by Michael Mercier's avatar Michael Mercier
Browse files

refactor (remove simctn var

parent c9542e1c
......@@ -14,26 +14,14 @@ global:
to_docker_image: oarteam/batsim:latest
dir: /root
batsim_commit: 9a300be66 # Mon Jan 9 16:17:09 2017
batsim_commit: c9542e1c3ff5ffff
bootstrap:
- "@base"
setup:
- build_and_install_batsim:
- do_it:
- exec_in: |
cd $${dir}
git clone https://github.com/oar-team/batsim.git
- exec_in: |
cd $${dir}/batsim
git checkout $${batsim_commit}
mkdir build
- exec_in: |
cd $${dir}/batsim/build
cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/g++-6
make -j$(nproc)
make install
- batsim_build_and_install
export:
- "@base"
- tag_and_push_image:
......
......@@ -26,7 +26,7 @@ global:
default_timezone: Europe/Paris
root_password: root
hostname: batsim
simctn_dir: /root
work_dir: /root
simgrid_commit: dccf1b41e9c7b # Wed Nov 30 14:08:01 2016
execo_commit: 725fddc
......@@ -56,51 +56,7 @@ setup:
- simgrid_install:
- commit_hash: $${simgrid_commit}
- batsim:
# Need testing to be available
- install dependencies:
- exec_in: |
apt-get -y -t testing install \
libboost-all-dev \
libgmp-dev \
redis-server \
libhiredis-dev \
libev-dev \
python-yaml \
libssl-dev 2>&1
# Install rapidjson (not available in jessie)
- exec_in: |
cd $${simctn_dir}
git clone https://github.com/miloyip/rapidjson.git
- exec_in: |
cd $${simctn_dir}/rapidjson
git checkout 3d5848a # v1.02
cp -a include/rapidjson /usr/include
- exec_in: |
cd $${simctn_dir}
git clone https://github.com/hmartiro/redox.git
cd redox
git checkout 64becf28f3dd
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=../install
make -j $(nproc)
make install
cd ../install
mv -f lib64 lib
sudo cp -r ./* /usr/
- install_test_dependencies:
- exec_in: apt install -y -t testing python-pip valgrind python-pandas
- exec_in: pip2 install sortedcontainers redis
- exec_in: |
cd $${simctn_dir}
git clone https://github.com/mickours/execo.git
cd execo
git checkout $${execo_commit}
pip install -e .
- install_doc_dependencies:
- exec_in: apt install -y -t testing doxygen graphviz
- batsim_dependencies
- reprozip:
- reprozip_version: 1.0.8
......
......@@ -12,7 +12,7 @@ global:
backend: docker
from_docker_image: oarteam/batsim:latest
to_docker_image: mickours/batsim:latest
simctn_dir: /root
workdir: /root
locality_sched_commit: 12df12a
oar_commit: 2c7c4df
......@@ -37,10 +37,10 @@ setup:
- exec_in: apt -y --force-yes install python3-pip 2>&1
- install_oar3:
- exec_in: |
cd $${simctn_dir}
cd $${workdir}
git clone https://github.com/oar-team/oar3.git
- exec_in: |
cd $${simctn_dir}/oar3
cd $${workdir}/oar3
git checkout $${oar_commit}
pip3 install -e .
......@@ -54,11 +54,11 @@ setup:
- exec_in: apt-get -y --force-yes install vite 2>&1
#- get_sources:
#- - exec_in: |
#- cd $${simctn_dir}
#- cd $${workdir}
#- svn checkout svn://scm.gforge.inria.fr/svnroot/vite/
#- install_it:
#- - exec_in: |
#- cd $${simctn_dir}/vite/trunk
#- cd $${workdir}/vite/trunk
#- mkdir build
#- cd build
#- cmake ..
......@@ -75,7 +75,7 @@ setup:
# Experiment inputs and launch scripts
#
- import_batsim_experiment_tools:
- expe_batsim_home: $${simctn_dir}
- expe_batsim_home: $${workdir}
#
# Personal customization
......
- clone:
- exec_in: |
cd $${dir}
git clone https://github.com/oar-team/batsim.git
- exec_in: |
cd $${dir}/batsim
git checkout $${batsim_commit}
mkdir build
- make_and_install:
- exec_in: |
cd $${dir}/batsim/build
cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/g++-6
make -j$(nproc)
make install
- work_dir: /root
# Need testing to be available
- install dependencies:
- exec_in: |
apt-get -y -t testing install \
libboost-all-dev \
libgmp-dev \
redis-server \
libhiredis-dev \
libev-dev \
python-yaml \
libssl-dev 2>&1
# Install rapidjson (not available in jessie)
- exec_in: |
cd $${work_dir}
git clone https://github.com/miloyip/rapidjson.git
- exec_in: |
cd $${work_dir}/rapidjson
git checkout 3d5848a # v1.02
cp -a include/rapidjson /usr/include
- exec_in: |
cd $${work_dir}
git clone https://github.com/hmartiro/redox.git
cd redox
git checkout $${simgrid_commit}
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=../install
make -j $(nproc)
make install
cd ../install
mv -f lib64 lib
sudo cp -r ./* /usr/
- install_test_dependencies:
- exec_in: apt install -y -t testing python-pip valgrind python-pandas
- exec_in: pip2 install sortedcontainers redis
- exec_in: |
cd $${work_dir}
git clone https://github.com/mickours/execo.git
cd execo
git checkout $${execo_commit}
pip install -e .
- install_doc_dependencies:
- exec_in: apt install -y -t testing doxygen graphviz
......@@ -11,9 +11,9 @@
python3-jupyter-core
- install_evalys:
- exec_in: |
cd $${simctn_dir}
cd $${work_dir}
git clone https://github.com/oar-team/evalys.git
cd evalys
git checkout $${evalys_commit}
cd $${simctn_dir}/evalys
cd $${work_dir}/evalys
pip3 install -e .
- change_git_ro_remote_to_dev_remote:
# For expe-batsim
- exec_in: |
cd $${simctn_dir}/batsim-experiments
cd $${work_dir}/batsim-experiments
git remote rename origin readonly
git remote add origin git@github.com:oar-team/batsim-experiments.git
# For batsim
- exec_in: |
cd $${simctn_dir}/batsim
cd $${work_dir}/batsim
git remote rename origin readonly
git remote add origin git@github.com:oar-team/batsim.git
......@@ -22,7 +22,7 @@
- exec_in: |
mkdir -p $${work_dir}
cd $${work_dir}
git clone https://github.com/simgrid/simgrid
git clone https://github.com/simgrid/simgrid.git
- exec_in: |
cd $${work_dir}/simgrid
git checkout $${commit_hash}
......
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