jjb: lava: fix benchmark clone path

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>

diff --git a/lava/baremetal-tests/failing-close.yml b/lava/baremetal-tests/failing-close.yml
index 5273a2ccad109e6c9e4b07341d16bbc3db8fad1d..ea5f2b3cf691dda3e863b3f7dfc45849d14a262a 100644 (file)
--- a/lava/baremetal-tests/failing-close.yml
+++ b/lava/baremetal-tests/failing-close.yml
@@ -15,13 +15,13 @@ install:
                   branch: master
         steps:
                 - export TMPDIR="/tmp"
-                - export BENCHMARK_DIR=$(mktemp --directory)
                 - ulimit -c unlimited
                 - mkdir -p coredump
                 - echo "$(pwd)/coredump/core.%e.%p.%h.%t" > /proc/sys/kernel/core_pattern
 run:
         steps:
                 - source /root/lttngvenv/activate
+                - export BENCHMARK_DIR=$(mktemp --directory)/bm
                 - git clone https://github.com/frdeso/syscall-bench-it.git $BENCHMARK_DIR
                 - cd $BENCHMARK_DIR
                 - lava-test-case build-benchmarks --shell "make"

diff --git a/lava/baremetal-tests/failing-ioctl.yml b/lava/baremetal-tests/failing-ioctl.yml
index b009ed948c02658bf746010a74ec76a2095acf6a..573b73896e76262230130cbdb4cb642f3132f854 100644 (file)
--- a/lava/baremetal-tests/failing-ioctl.yml
+++ b/lava/baremetal-tests/failing-ioctl.yml
@@ -15,13 +15,13 @@ install:
                   branch: master
         steps:
                 - export TMPDIR="/tmp"
-                - export BENCHMARK_DIR=$(mktemp --directory)
                 - ulimit -c unlimited
                 - mkdir -p coredump
                 - echo "$(pwd)/coredump/core.%e.%p.%h.%t" > /proc/sys/kernel/core_pattern
 run:
         steps:
                 - source /root/lttngvenv/activate
+                - export BENCHMARK_DIR=$(mktemp --directory)/bm
                 - git clone https://github.com/frdeso/syscall-bench-it.git $BENCHMARK_DIR
                 - cd $BENCHMARK_DIR
                 - lava-test-case build-benchmarks --shell "make"

diff --git a/lava/baremetal-tests/failing-open-efault.yml b/lava/baremetal-tests/failing-open-efault.yml
index 6159835299326ec54b46bf341ba9b02352601dda..b8a5ca96c4a19d5233f7201051347abacf8515ca 100644 (file)
--- a/lava/baremetal-tests/failing-open-efault.yml
+++ b/lava/baremetal-tests/failing-open-efault.yml
@@ -15,13 +15,13 @@ install:
                   branch: master
         steps:
                 - export TMPDIR="/tmp"
-                - export BENCHMARK_DIR=$(mktemp --directory)
                 - ulimit -c unlimited
                 - mkdir -p coredump
                 - echo "$(pwd)/coredump/core.%e.%p.%h.%t" > /proc/sys/kernel/core_pattern
 run:
         steps:
                 - source /root/lttngvenv/activate
+                - export BENCHMARK_DIR=$(mktemp --directory)/bm
                 - git clone https://github.com/frdeso/syscall-bench-it.git $BENCHMARK_DIR
                 - cd $BENCHMARK_DIR
                 - lava-test-case build-benchmarks --shell "make"

diff --git a/lava/baremetal-tests/failing-open-enoent.yml b/lava/baremetal-tests/failing-open-enoent.yml
index c0912a50e98a15c33ea653fa8061560febbf2c74..47dfc2ffacbf0487f768521ff105a794ebb11d06 100644 (file)
--- a/lava/baremetal-tests/failing-open-enoent.yml
+++ b/lava/baremetal-tests/failing-open-enoent.yml
@@ -15,13 +15,13 @@ install:
                   branch: master
         steps:
                 - export TMPDIR="/tmp"
-                - export BENCHMARK_DIR=$(mktemp --directory)
                 - ulimit -c unlimited
                 - mkdir -p coredump
                 - echo "$(pwd)/coredump/core.%e.%p.%h.%t" > /proc/sys/kernel/core_pattern
 run:
         steps:
                 - source /root/lttngvenv/activate
+                - export BENCHMARK_DIR=$(mktemp --directory)/bm
                 - git clone https://github.com/frdeso/syscall-bench-it.git $BENCHMARK_DIR
                 - cd $BENCHMARK_DIR
                 - lava-test-case build-benchmarks --shell "make"
@@ -35,4 +35,3 @@ run:
                 - tar czf coredump.tar.gz coredump
                 - lava-test-case-attach run-benchmarks coredump.tar.gz
                 - lava-test-case-attach run-benchmarks "./processed_results_open_enoent.csv"
-

diff --git a/lava/baremetal-tests/lttng-test-filter.yml b/lava/baremetal-tests/lttng-test-filter.yml
index 5327fffda6756faa1f64031ad66d984f6506d3e1..ed869c10c9af0954550a1d802351fbbf8228e4b6 100644 (file)
--- a/lava/baremetal-tests/lttng-test-filter.yml
+++ b/lava/baremetal-tests/lttng-test-filter.yml
@@ -10,9 +10,6 @@ install:
                 - python3-pandas
                 - python3-numpy
         git-repos:
-                - url: https://github.com/frdeso/syscall-bench-it.git
-                  destination: /tmp/benchmarks
-                  branch: master
                 - url: https://github.com/lttng/lttng-ci
                   destination: ci
                   branch: master
@@ -24,14 +21,16 @@ install:
 run:
         steps:
                 - source /root/lttngvenv/activate
-                - cd /tmp/benchmarks
+                - export BENCHMARK_DIR=$(mktemp --directory)/bm
+                - git clone https://github.com/frdeso/syscall-bench-it.git $BENCHMARK_DIR
+                - cd $BENCHMARK_DIR
                 - modprobe lttng-test
                 - lava-test-case build-benchmarks --shell "make"
                 - lava-test-case run-benchmarks --shell "./run.sh lttng-test-filter lttng_test_filter_event"
                 - lava-test-case-attach run-benchmarks "./results.csv"
                 - cd -
                 - cd ci
-                - python3 ./scripts/lttng-baremetal-tests/parse-results.py /tmp/benchmarks/results.csv
+                - python3 ./scripts/lttng-baremetal-tests/parse-results.py $BENCHMARK_DIR/results.csv
                 - mv ./processed_results.csv ../processed_results_lttng_test_filter.csv
                 - cd -
                 - tar czf coredump.tar.gz coredump

diff --git a/lava/baremetal-tests/raw-syscall-getpid.yml b/lava/baremetal-tests/raw-syscall-getpid.yml
index ef4057f7fc85d044d4ad728e800ea59881f25b2e..8c70790fcbcd0170760c0613ce65dc61d21c8a95 100644 (file)
--- a/lava/baremetal-tests/raw-syscall-getpid.yml
+++ b/lava/baremetal-tests/raw-syscall-getpid.yml
@@ -15,13 +15,13 @@ install:
                   branch: master
         steps:
                 - export TMPDIR="/tmp"
-                - export BENCHMARK_DIR=$(mktemp --directory)
                 - ulimit -c unlimited
                 - mkdir -p coredump
                 - echo "$(pwd)/coredump/core.%e.%p.%h.%t" > /proc/sys/kernel/core_pattern
 run:
         steps:
                 - source /root/lttngvenv/activate
+                - export BENCHMARK_DIR=$(mktemp --directory)/bm
                 - git clone https://github.com/frdeso/syscall-bench-it.git $BENCHMARK_DIR
                 - cd $BENCHMARK_DIR
                 - lava-test-case build-benchmarks --shell "make"

diff --git a/lava/baremetal-tests/success-dup-close.yml b/lava/baremetal-tests/success-dup-close.yml
index 103ea4457ffb88b79cfd0d1d322bb6214b2e598c..08f33affc92b95113c1588990eb9febf5f6dbc79 100644 (file)
--- a/lava/baremetal-tests/success-dup-close.yml
+++ b/lava/baremetal-tests/success-dup-close.yml
@@ -15,13 +15,13 @@ install:
                   branch: master
         steps:
                 - export TMPDIR="/tmp"
-                - export BENCHMARK_DIR=$(mktemp --directory)
                 - ulimit -c unlimited
                 - mkdir -p coredump
                 - echo "$(pwd)/coredump/core.%e.%p.%h.%t" > /proc/sys/kernel/core_pattern
 run:
         steps:
                 - source /root/lttngvenv/activate
+                - export BENCHMARK_DIR=$(mktemp --directory)/bm
                 - git clone https://github.com/frdeso/syscall-bench-it.git $BENCHMARK_DIR
                 - cd $BENCHMARK_DIR
                 - lava-test-case build-benchmarks --shell "make"