aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin <quentin@dufour.io>2022-09-29 20:57:53 +0200
committerQuentin <quentin@dufour.io>2022-09-29 20:57:53 +0200
commitdb88b939c35b84d3a3758b20b0b7d9914e3f19c5 (patch)
tree4762ebd89146c65e53c04d6303931dcc84985196
parent6d964937b348542ea0be157847ba57dea467a3b1 (diff)
parent37040718ea895dacb497e08760cb77cb63b40ecc (diff)
downloadmknet-main.tar.gz
mknet-main.zip
Merge pull request 'Fix venv sourcing' (#2) from baptiste/mknet:misc_fixes into mainHEADmain
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/mknet/pulls/2
-rw-r--r--README.md1
-rwxr-xr-xprepare.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/README.md b/README.md
index 95f19d7..d5849f4 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ All scenarios:
- `./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-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,
a default one will be selected for you.*
diff --git a/prepare.py b/prepare.py
index e7021ea..bcb3353 100755
--- a/prepare.py
+++ b/prepare.py
@@ -23,7 +23,7 @@ os.chdir(me)
print("--- install python dependencies ---")
venv.create(".venv", with_pip=True)
shared.exec("""
-source .venv/bin/activate
+. .venv/bin/activate
which python3
python3 -m pip install .
python3 -m pip install -r scenarios/requirements.txt
@@ -36,6 +36,6 @@ flavor.download()
print(f"""done! now, run:
> sudo -i
> cd {os.getcwd()}
-> source ./.venv/bin/activate
+> . ./.venv/bin/activate
> ./mknet scenario ./topo/with-vdsl.yml ./scenarios/garage-s3lat garage-v0.8
""")