From: Waldemar Kozaczuk <[email protected]>
Committer: Waldemar Kozaczuk <[email protected]>
Branch: master
tests: enhanced some apps to be testable with firecracker
Signed-off-by: Waldemar Kozaczuk <[email protected]>
---
diff --git a/elasticsearch/tests/load_data.sh
b/elasticsearch/tests/load_data.sh
--- a/elasticsearch/tests/load_data.sh
+++ b/elasticsearch/tests/load_data.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-curl -X PUT "localhost:9200/library/book/_bulk?refresh&pretty"
-H 'Content-Type: application/json' -d'
+curl -X PUT "$OSV_HOSTNAME:9200/library/book/_bulk?refresh&pretty"
-H 'Content-Type: application/json' -d'
{"index":{"_id": "Leviathan Wakes"}}
{"name": "Leviathan Wakes", "author": "James S.A.
Corey", "release_date": "2011-06-02", "page_count": 561}
{"index":{"_id": "Hyperion"}}
diff --git a/ffmpeg/mpm/package.yaml b/ffmpeg/mpm/package.yaml
--- a/ffmpeg/mpm/package.yaml
+++ b/ffmpeg/mpm/package.yaml
@@ -1,2 +1,4 @@
title: Ffmpeg
version: 4.2
+require:
+- osv.libz
diff --git a/iperf3/tester.py b/iperf3/tester.py
--- a/iperf3/tester.py
+++ b/iperf3/tester.py
@@ -1,11 +1,13 @@
import sys
import subprocess
+import os
success = False
print("Started iperf3 test ...")
try:
- output =
subprocess.check_output(["iperf3", "-t", "5", "-c", "localhost"],
stderr=subprocess.STDOUT)
+ server_host = os.getenv('OSV_HOSTNAME')
+ output = subprocess.check_output(["iperf3", "-t", "5", "-c",
server_host], stderr=subprocess.STDOUT)
print(output)
if 'iperf Done' in output:
diff --git a/mysql/sysbench.sh b/mysql/sysbench.sh
--- a/mysql/sysbench.sh
+++ b/mysql/sysbench.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-sysbench /usr/share/sysbench/oltp_read_write.lua --mysql-host=127.0.0.1
--mysql-port=3306 --mysql-user=admin --mysql-password=osv --mysql-db=test
--db-driver=mysql --tables=3 --table-size=100000 prepare
+sysbench /usr/share/sysbench/oltp_read_write.lua
--mysql-host=$OSV_HOSTNAME --mysql-port=3306 --mysql-user=admin
--mysql-password=osv --mysql-db=test --db-driver=mysql --tables=3
--table-size=100000 prepare
sleep 1
-sysbench /usr/share/sysbench/oltp_read_write.lua --mysql-host=127.0.0.1
--mysql-port=3306 --mysql-user=admin --mysql-password='osv' --mysql-db=test
--db-driver=mysql --tables=3 --table-size=100000 --report-interval=10
--threads=12 --time=60 run 2>&1
+sysbench /usr/share/sysbench/oltp_read_write.lua
--mysql-host=$OSV_HOSTNAME --mysql-port=3306 --mysql-user=admin
--mysql-password='osv' --mysql-db=test --db-driver=mysql --tables=3
--table-size=100000 --report-interval=10 --threads=12 --time=60 run 2>&1
diff --git a/redis-memonly/tester.py b/redis-memonly/tester.py
--- a/redis-memonly/tester.py
+++ b/redis-memonly/tester.py
@@ -1,11 +1,13 @@
import sys
+import os
import subprocess
success = False
print("Started redis test ...")
try:
- output =
subprocess.check_output(["redis-benchmark", "-t", "set,lpush", "-n", "100000", "-q"],
stderr=subprocess.STDOUT)
+ server_host = os.getenv('OSV_HOSTNAME')
+ output = subprocess.check_output(["redis-benchmark", "-h",
server_host, "-t", "set,lpush", "-n", "100000", "-q"],
stderr=subprocess.STDOUT)
print(output)
if 'requests per second' in output:
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/0000000000006a321205965db1e9%40google.com.
