Merge branch 'load-gen' into 'integration' (98910405) · Commits · flame / flame-clmc · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

flame-clmc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

98910405

Commit 98910405 authored 7 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'load-gen' into 'integration'

Load gen

See merge request FLAME/flame-clmc!14

parents a5c9b4db 632cc1e2

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Vagrantfile 2 additions, 1 deletion

Vagrantfile
infra/streaming/rspec.yml 8 additions, 8 deletions

infra/streaming/rspec.yml
test/services/ffmpeg/install.sh 4 additions, 4 deletions

test/services/ffmpeg/install.sh
test/services/jmeter/install.sh 8 additions, 5 deletions

test/services/jmeter/install.sh
test/services/loadtest-streaming/install.sh 32 additions, 0 deletions

test/services/loadtest-streaming/install.sh
test/services/loadtest-streaming/telegraf_template.conf 112 additions, 0 deletions

test/services/loadtest-streaming/telegraf_template.conf
test/services/vlc/install.sh 2 additions, 2 deletions

test/services/vlc/install.sh
test/streaming/run.sh 48 additions, 0 deletions

test/streaming/run.sh
test/streaming/stop.sh 3 additions, 0 deletions

test/streaming/stop.sh
test/streaming/testplan.jmx 67 additions, 0 deletions

test/streaming/testplan.jmx

with 286 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment