From 4d4126d5bf49b76e8e42603878721efbcb45b543 Mon Sep 17 00:00:00 2001
From: Chase Qi <chase.qi@linaro.org>
Date: Wed, 23 Feb 2022 15:50:57 +0800
Subject: [PATCH] ci: enable ltp testing on linux builds
Signed-off-by: Chase Qi <chase.qi@linaro.org>
---
.gitlab-ci.yml | 53 ++++++++++++++++++++++++++++++++++++-
.oniro-ci/test-generic.yaml | 19 ++++++++++---
2 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f77bc1d..7df343dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,6 +158,46 @@ lava-seco-intel-b68:
CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-intel-b68.yaml"
CI_REPORT_JOB_NAME: lava-report
+lava-qemu-x86-ltp:
+ needs: [linux-qemu-x86]
+ stage: test
+ extends: .lava-test
+ variables:
+ MACHINE: qemux86
+ CI_BUILD_JOB_NAME: linux-qemu-x86
+ CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-x86-ltp.yaml"
+ CI_REPORT_JOB_NAME: lava-report
+
+lava-qemu-x86_64-ltp:
+ needs: [linux-qemu-x86_64]
+ stage: test
+ extends: .lava-test
+ variables:
+ MACHINE: qemux86-64
+ CI_BUILD_JOB_NAME: linux-qemu-x86_64
+ CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-x86_64-ltp.yaml"
+ CI_REPORT_JOB_NAME: lava-report
+
+lava-raspberrypi4-64-ltp:
+ needs: [linux-raspberrypi4-64]
+ stage: test
+ extends: .lava-test
+ variables:
+ MACHINE: raspberrypi4-64
+ CI_BUILD_JOB_NAME: linux-raspberrypi4-64
+ CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/raspberrypi4-64-ltp.yaml"
+ CI_REPORT_JOB_NAME: lava-report
+
+lava-seco-intel-b68-ltp:
+ needs: [linux-seco-intel-b68]
+ stage: test
+ extends: .lava-test
+ variables:
+ MACHINE: seco-intel-b68
+ CI_BUILD_JOB_NAME: linux-seco-intel-b68
+ CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-intel-b68-ltp.yaml"
+ CI_REPORT_JOB_NAME: lava-report
+
lava-zephyr-96b-nitrogen-tests:
needs: [zephyr-96b-nitrogen-tests]
stage: test
@@ -189,7 +229,18 @@ lava-zephyr-qemu-x86:
CI_REPORT_JOB_NAME: lava-report
lava-report:
- needs: [lava-qemu-x86, lava-qemu-x86_64, lava-zephyr-96b-nitrogen-tests, lava-zephyr-qemu-cortex-m3, lava-zephyr-qemu-x86, lava-raspberrypi4-64, lava-seco-intel-b68]
+ needs:
+ - lava-qemu-x86
+ - lava-qemu-x86_64
+ - lava-raspberrypi4-64
+ - lava-seco-intel-b68
+ - lava-qemu-x86-ltp
+ - lava-qemu-x86_64-ltp
+ - lava-raspberrypi4-64-ltp
+ - lava-seco-intel-b68-ltp
+ - lava-zephyr-96b-nitrogen-tests
+ - lava-zephyr-qemu-cortex-m3
+ - lava-zephyr-qemu-x86
extends: .lava-report
lava-badge:
diff --git a/.oniro-ci/test-generic.yaml b/.oniro-ci/test-generic.yaml
index f2854aa1..87b44274 100644
--- a/.oniro-ci/test-generic.yaml
+++ b/.oniro-ci/test-generic.yaml
@@ -11,6 +11,9 @@
variables:
GIT_STRATEGY: none
CI_LAVA_INSTANCE: "https://lava.ostc-eu.org/"
+ # Run the same ltp test suites that using by LKFT project.
+ # Reference: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.98-75-g9f5cb871ceb9/testjobs/
+ LTP_TST_CMDFILES: "cap_bounds cpuhotplug crypto nptl pty securebits fs controllers hugetlb mm tracing containers io dio syscalls math commands ipc fcntl-locktests filecaps fs_bind fs_perms_simple fsx sched cve"
before_script:
- test -n "$CI_LAVA_TOKEN" || (
echo "precondition failed - please disable the child job if CI_LAVA_TOKEN not set in gitlab CI/CD variables"
@@ -43,27 +46,37 @@
-e 's,$ci_pipeline_url,'"$CI_PIPELINE_URL"','
-e 's/$build_job_id/'"$build_job_id"'/'
-e 's,$callback_url,'"$CALLBACK_URL"',' job_def.yaml
- # Generate job definitions for zephyr build
+ # Generate test jobs.
- |
+ set -x
rm -rf lava_jobs && mkdir lava_jobs
+ # Generate job definitions for zephyr build
if echo "${CI_BUILD_JOB_NAME}" | grep -i "zephyr"; then
for image in $(find artifacts/images/${MACHINE} -name "*.elf" -exec basename {} \;); do
image_basename=$(basename "${image}" ".elf")
echo "--- Generating lava job definition ${image_basename}.yaml ---"
sed "s/\$image_basename/$image_basename/" job_def.yaml | tee lava_jobs/"${image_basename}".yaml
done
+ # Generate job definitions for linux LTP test.
+ elif grep -q "\$TST_CMDFILES" job_def.yaml; then
+ for test_cmdfile in ${LTP_TST_CMDFILES}; do
+ ltp_job_name="ltp-${test_cmdfile}.yaml"
+ echo "--- Generating lava job definition ${ltp_job_name} ---"
+ sed "s/\$TST_CMDFILES/${test_cmdfile}/" job_def.yaml | tee lava_jobs/"${ltp_job_name}"
+ done
else
mv job_def.yaml lava_jobs/
fi
+ set +x
# Submit the job to LAVA.
- |
for job_def in $(find lava_jobs/ -name "*.yaml"); do
lava_job_id=$(curl -X POST -H "Authorization: Token $CI_LAVA_TOKEN" -F "definition=$(<${job_def})" "$CI_LAVA_INSTANCE/api/v0.2/jobs/" | jq ".job_ids" | tr -d "[\n ]")
- if [ -n "${lava_job_id}" ]; then
+ if [ "${lava_job_id}" != "null" ]; then
echo "$CI_LAVA_INSTANCE/scheduler/job/$lava_job_id"
echo "$lava_job_id" >> job_ids_"${CI_JOB_NAME}_${lava_job_id}".txt
else
- echo "Failed to submit LAVA job"
+ echo "Failed to submit ${job_def}"
exit 1
fi
done
--
GitLab