Deuxfleurs/mknet
17
1
Fork 2
Code Issues Pull requests Projects Releases Wiki Activity

Fix venv sourcing #2

Merged
quentin merged 2 commits from baptiste/mknet:misc_fixes into main 2022-09-29 18:57:53 +00:00
Conversation 0 Commits 2 Files changed 2 +3 -2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -49,6 +49,7 @@ All scenarios:
- `./scenarios/garage-s3lat [garage-v0.7|garage-v0.8]` - Run s3lat on Garage - `./scenarios/garage-s3lat [garage-v0.7|garage-v0.8]` - Run s3lat on Garage
- `./scenarios/garage-concurrent [garage-v0.7|garage-v0.8]` - Run s3concurrent on Garage - `./scenarios/garage-concurrent [garage-v0.7|garage-v0.8]` - Run s3concurrent on Garage
- `./scenarios/garage-warp [garage-v0.7|garage-v0.8] [default|fast]` - Run warp on Garage. 2 flavors are available: fast and default. - `./scenarios/garage-warp [garage-v0.7|garage-v0.8] [default|fast]` - Run warp on Garage. 2 flavors are available: fast and default.
- `./scenarios/garage-s3billion [garage-v0.7|garage-v0.8]` - Run s3billion on Garage
*Scenarios take optional flavors as input that modulate their behavioir. Passing them is not mandatory, *Scenarios take optional flavors as input that modulate their behavioir. Passing them is not mandatory,
a default one will be selected for you.* a default one will be selected for you.*

4
prepare.py
View file

@ -23,7 +23,7 @@ os.chdir(me)
print("--- install python dependencies ---") print("--- install python dependencies ---")
venv.create(".venv", with_pip=True) venv.create(".venv", with_pip=True)
shared.exec(""" shared.exec("""
source .venv/bin/activate . .venv/bin/activate
which python3 which python3
python3 -m pip install . python3 -m pip install .
python3 -m pip install -r scenarios/requirements.txt python3 -m pip install -r scenarios/requirements.txt
@ -36,6 +36,6 @@ flavor.download()
print(f"""done! now, run: print(f"""done! now, run:
> sudo -i > sudo -i
> cd {os.getcwd()} > cd {os.getcwd()}
> source ./.venv/bin/activate > . ./.venv/bin/activate
> ./mknet scenario ./topo/with-vdsl.yml ./scenarios/garage-s3lat garage-v0.8 > ./mknet scenario ./topo/with-vdsl.yml ./scenarios/garage-s3lat garage-v0.8
""") """)