diff --git a/automated/linux/cyclictest/cyclictest.sh b/automated/linux/cyclictest/cyclictest.sh index 8ae770909..3d8a9f70c 100755 --- a/automated/linux/cyclictest/cyclictest.sh +++ b/automated/linux/cyclictest/cyclictest.sh @@ -10,7 +10,7 @@ OUTPUT="$(pwd)/output" LOGFILE="${OUTPUT}/cyclictest.json" RESULT_FILE="${OUTPUT}/result.txt" -PRIORITY="98" +RT_PRIORITY="98" INTERVAL="1000" THREADS="1" AFFINITY="0" @@ -25,7 +25,7 @@ usage() { while getopts ":p:i:t:a:D:h:w:" opt; do case "${opt}" in - p) PRIORITY="${OPTARG}" ;; + p) RT_PRIORITY="${OPTARG}" ;; i) INTERVAL="${OPTARG}" ;; t) THREADS="${OPTARG}" ;; a) AFFINITY="${OPTARG}" ;; @@ -60,7 +60,7 @@ fi background_process_start bgcmd --cmd "${BACKGROUND_CMD}" # shellcheck disable=SC2086 -"${binary}" -q -p "${PRIORITY}" -i "${INTERVAL}" -t "${THREADS}" -a "${AFFINITY}" \ +"${binary}" -q -p "${RT_PRIORITY}" -i "${INTERVAL}" -t "${THREADS}" -a "${AFFINITY}" \ -D "${DURATION}" ${HISTOGRAM} -m --json="${LOGFILE}" background_process_stop bgcmd diff --git a/automated/linux/cyclictest/cyclictest.yaml b/automated/linux/cyclictest/cyclictest.yaml index 7dc6aa244..e6aa2017e 100644 --- a/automated/linux/cyclictest/cyclictest.yaml +++ b/automated/linux/cyclictest/cyclictest.yaml @@ -29,7 +29,7 @@ metadata: params: # Priority of highest prio thread. - PRIORITY: "98" + RT_PRIORITY: "98" # Base interval of thread in us. INTERVAL: "1000" # Number of threads. @@ -54,6 +54,6 @@ params: run: steps: - cd ./automated/linux/cyclictest/ - - ./cyclictest.sh -D "${DURATION}" -p "${PRIORITY}" -i "${INTERVAL}" -t "${THREADS}" -a "${AFFINITY}" -h "${HISTOGRAM}" -w "${BACKGROUND_CMD}" + - ./cyclictest.sh -D "${DURATION}" -p "${RT_PRIORITY}" -i "${INTERVAL}" -t "${THREADS}" -a "${AFFINITY}" -h "${HISTOGRAM}" -w "${BACKGROUND_CMD}" - ../../utils/upload-to-artifactorial.sh -a "output/cyclictest.json" -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}" - ../../utils/send-to-lava.sh ./output/result.txt diff --git a/automated/linux/rt-migrate-test/rt-migrate-test.sh b/automated/linux/rt-migrate-test/rt-migrate-test.sh index c3ab0af78..9c9f24eba 100755 --- a/automated/linux/rt-migrate-test/rt-migrate-test.sh +++ b/automated/linux/rt-migrate-test/rt-migrate-test.sh @@ -9,7 +9,7 @@ LOGFILE="${OUTPUT}/rt-migrate-test" RESULT_FILE="${OUTPUT}/result.txt" TMP_RESULT_FILE="${OUTPUT}/tmp_result.txt" -PRIORITY="51" +RT_PRIORITY="51" DURATION="1m" BACKGROUND_CMD="" ITERATIONS=1 @@ -21,7 +21,7 @@ usage() { while getopts ":l:p:D:w:i:" opt; do case "${opt}" in - p) PRIORITY="${OPTARG}" ;; + p) RT_PRIORITY="${OPTARG}" ;; D) DURATION="${OPTARG}" ;; w) BACKGROUND_CMD="${OPTARG}" ;; i) ITERATIONS="${OPTARG}" ;; @@ -42,7 +42,7 @@ fi background_process_start bgcmd --cmd "${BACKGROUND_CMD}" for i in $(seq ${ITERATIONS}); do - "${binary}" -q -p "${PRIORITY}" -D "${DURATION}" -c --json="${LOGFILE}-${i}.json" + "${binary}" -q -p "${RT_PRIORITY}" -D "${DURATION}" -c --json="${LOGFILE}-${i}.json" done diff --git a/automated/linux/rt-migrate-test/rt-migrate-test.yaml b/automated/linux/rt-migrate-test/rt-migrate-test.yaml index 6674447cb..0dafb31ac 100644 --- a/automated/linux/rt-migrate-test/rt-migrate-test.yaml +++ b/automated/linux/rt-migrate-test/rt-migrate-test.yaml @@ -26,7 +26,7 @@ metadata: params: # Priority of lowest prio thread (3 threads are created). - PRIORITY: "96" + RT_PRIORITY: "96" # Execute rt-migrate-test for given time DURATION: "5m" # Background workload to be run during the meassurement @@ -42,6 +42,6 @@ params: run: steps: - cd ./automated/linux/rt-migrate-test/ - - ./rt-migrate-test.sh -p "${PRIORITY}" -D "${DURATION}" -i "${ITERATIONS}" -w "${BACKGROUND_CMD}" + - ./rt-migrate-test.sh -p "${RT_PRIORITY}" -D "${DURATION}" -i "${ITERATIONS}" -w "${BACKGROUND_CMD}" - ../../utils/upload-to-artifactorial.sh -a "output/rt-migrate-test.json" -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}" - ../../utils/send-to-lava.sh ./output/result.txt diff --git a/automated/linux/signaltest/signaltest.sh b/automated/linux/signaltest/signaltest.sh index 578527aa2..582d99fe9 100755 --- a/automated/linux/signaltest/signaltest.sh +++ b/automated/linux/signaltest/signaltest.sh @@ -9,7 +9,7 @@ LOGFILE="${OUTPUT}/signaltest" RESULT_FILE="${OUTPUT}/result.txt" TMP_RESULT_FILE="${OUTPUT}/tmp_result.txt" -PRIORITY="98" +RT_PRIORITY="98" THREADS="2" DURATION="1m" BACKGROUND_CMD="" @@ -22,7 +22,7 @@ usage() { while getopts ":p:t:D:w:i:" opt; do case "${opt}" in - p) PRIORITY="${OPTARG}" ;; + p) RT_PRIORITY="${OPTARG}" ;; t) THREADS="${OPTARG}" ;; D) DURATION="${OPTARG}" ;; w) BACKGROUND_CMD="${OPTARG}" ;; @@ -48,7 +48,7 @@ fi background_process_start bgcmd --cmd "${BACKGROUND_CMD}" for i in $(seq ${ITERATIONS}); do - "${binary}" -q -D "${DURATION}" -a -m -p "${PRIORITY}" -t "${THREADS}" --json="${LOGFILE}-${i}.json" + "${binary}" -q -D "${DURATION}" -a -m -p "${RT_PRIORITY}" -t "${THREADS}" --json="${LOGFILE}-${i}.json" done background_process_stop bgcmd diff --git a/automated/linux/signaltest/signaltest.yaml b/automated/linux/signaltest/signaltest.yaml index 6307abcfb..5ea3a99a6 100644 --- a/automated/linux/signaltest/signaltest.yaml +++ b/automated/linux/signaltest/signaltest.yaml @@ -27,7 +27,7 @@ metadata: params: # Priority of highest prio thread. - PRIORITY: "98" + RT_PRIORITY: "98" # Number of threads. # A value of "0" will run a thread per available CPU. THREADS: "2" @@ -46,6 +46,6 @@ params: run: steps: - cd ./automated/linux/signaltest - - ./signaltest.sh -D "${DURATION}" -p "${PRIORITY}" -t "${THREADS}" -i "${ITERATIONS}" -w "${BACKGROUND_CMD}" + - ./signaltest.sh -D "${DURATION}" -p "${RT_PRIORITY}" -t "${THREADS}" -i "${ITERATIONS}" -w "${BACKGROUND_CMD}" - ../../utils/upload-to-artifactorial.sh -a "output/signaltest.json" -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}" - ../../utils/send-to-lava.sh ./output/result.txt