-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update readme + add manifest for ansible files #109
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# maybe there is a better way to do it: | ||
# https://stackoverflow.com/questions/1612733 | ||
|
||
recursive-include orchestrator/ansible * | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,10 +44,8 @@ cd ombt-orchestrator | |
* Install the dependencies | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It seems that the README isn't rendered correctly on pypi, that's probably because it's written in md instead of rst. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I added in f856066 the proper type to the configuration, see: https://packaging.python.org/tutorials/distributing-packages/#description There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. once again 😺 👍 💡 ! |
||
|
||
``` | ||
virtualenv venv | ||
source venv/bin/activate | ||
pip install -U pip | ||
pip install -r requirements.txt | ||
pip install -e . | ||
``` | ||
|
||
> On Grid'5000 you can launch this command from any frontend. | ||
|
@@ -59,8 +57,8 @@ The default configurations are currently defined in the `conf.yaml` file. | |
## Command line interface | ||
|
||
``` | ||
> cli.py | ||
Usage: cli.py [OPTIONS] COMMAND [ARGS]... | ||
> oo | ||
Usage: oo [OPTIONS] COMMAND [ARGS]... | ||
|
||
Options: | ||
--help Show this message and exit. | ||
|
@@ -83,14 +81,14 @@ Commands: | |
## Workflow to run a test case | ||
|
||
|
||
* Deploying and launching the benchmark. | ||
* Deploying and launching the benchmark (default driver `broker` is defined in the configuration file) | ||
|
||
``` | ||
# default confs.yaml on $PWD will be read | ||
> cli.py deploy --driver=rabbitmq vagrant | ||
> oo deploy --driver=broker vagrant | ||
|
||
# Launch the one benchmark | ||
> cli.py test_case_1 --nbr_clients 10 --nbr_servers 2 | ||
> oo test_case_1 --nbr_clients 10 --nbr_servers 2 | ||
``` | ||
|
||
> Adapt to the relevant provider (e.g `g5k`) | ||
|
@@ -102,7 +100,7 @@ Grafana is available on the port 3000 of the control node (check the inventory f | |
* Backuping the environment | ||
|
||
``` | ||
> cli.py backup | ||
> oo backup | ||
``` | ||
|
||
> The files retrieved by this action are located in `current/backup` dir by default. | ||
|
@@ -111,11 +109,11 @@ Grafana is available on the port 3000 of the control node (check the inventory f | |
|
||
``` | ||
# Preparing the next run by cleaning the environment | ||
> cli.py destroy | ||
> cli.py deploy --driver=rabbitmq vagrant | ||
> oo destroy | ||
> oo deploy vagrant | ||
|
||
# Next run | ||
> cli.py test_case_1 --nbr_clients 20 --nbr_servers 2 | ||
> oo test_case_1 --nbr_clients 20 --nbr_servers 2 | ||
``` | ||
|
||
> It's possible to force an experimentation dir with `--env mydir` | ||
|
@@ -130,7 +128,7 @@ Grafana is available on the port 3000 of the control node (check the inventory f | |
to run the first test case enabled on the framework run: | ||
|
||
``` shell | ||
> cli.py campaign --provider g5k test_case_1 | ||
> oo campaign --provider g5k test_case_1 | ||
``` | ||
|
||
* Alternatively a campaign can be executed in a _incremental_ mode in which deployments are | ||
|
@@ -150,7 +148,7 @@ Grafana is available on the port 3000 of the control node (check the inventory f | |
instead of the default and execute: | ||
|
||
``` shell | ||
> cli.py campaign --incremental --provider g5k test_case_1 | ||
> oo campaign --incremental --provider g5k test_case_1 | ||
``` | ||
|
||
## Misc. | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,10 +4,12 @@ version = 1.0.0 | |
description = Oslo messaging benchmarking orchestrator | ||
keywords = benchmark, oslo messaging, RPC | ||
license = GPL-3.0 | ||
license_file = LICENSE.txt | ||
url = https://github.com/msimonin/ombt-orchestrator/ | ||
author = Matthieu Simonin | ||
author_email = matthieu.simonin@inria.fr | ||
long_description = file: README.md | ||
long_description_content_type = text/markdown | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 😺 👍 💡 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the PKG-INFO in the tgz file set the value properly: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
project_urls = | ||
Bug Reports = https://github.com/msimonin/ombt-orchestrator/issues | ||
Source = https://github.com/msimonin/ombt-orchestrator/ | ||
|
@@ -41,3 +43,6 @@ exclude = | |
[options.entry_points] | ||
console_scripts = | ||
oo = orchestrator.cli:cli | ||
|
||
[bdist_wheel] | ||
python-tag = py27 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe add
include LICENSE
alsoThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
running
python setup.py bdist_wheel
looks good on my side now. I've renamed the licence file to fit the spec.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
include LICENSE.txt
is necessary for the dist package to work.Should we publish only wheels ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wheels is based on the new spec but if for any reason a system only allows users to use former formats we can also include the licence in the manifest.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok