From 200ebc0eb999be085650c4925eafab7e7afebaca Mon Sep 17 00:00:00 2001
From: Chase Qi <chase.qi@linaro.org>
Date: Wed, 10 Aug 2022 09:18:37 +0800
Subject: [PATCH] ci: make MR lava test jobs a high priority
Signed-off-by: Chase Qi <chase.qi@linaro.org>
---
.gitlab-ci.yml | 17 +++++++++++------
.oniro-ci/test-generic.yaml | 2 ++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f884183f..93a79191 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -198,6 +198,11 @@ publish-seco-intel-b68:
# Run the build for scheduled pipelines.
- if: '$CI_PIPELINE_SOURCE == "schedule"'
+.lava-test-mr:
+ extends: .lava-test
+ variables:
+ CI_LAVA_JOB_PRIORITY: "high"
+
.lava-test-scheduled:
extends: .lava-test
variables:
@@ -213,7 +218,7 @@ publish-seco-intel-b68:
lava-qemu-x86:
needs: [linux-qemu-x86-gcc]
stage: test
- extends: .lava-test
+ extends: .lava-test-mr
variables:
MACHINE: qemux86
CI_BUILD_JOB_NAME: linux-qemu-x86-gcc
@@ -223,7 +228,7 @@ lava-qemu-x86:
lava-qemu-x86_64:
needs: [linux-qemu-x86_64-gcc]
stage: test
- extends: .lava-test
+ extends: .lava-test-mr
variables:
MACHINE: qemux86-64
CI_BUILD_JOB_NAME: linux-qemu-x86_64-gcc
@@ -451,7 +456,7 @@ lava-seco-c61-2gb-perf:
lava-zephyr-qemu-cortex-m3:
needs: [zephyr-qemu-cortex-m3-gcc]
stage: test
- extends: .lava-test
+ extends: .lava-test-mr
variables:
MACHINE: qemu-cortex-m3
CI_BUILD_JOB_NAME: zephyr-qemu-cortex-m3-gcc
@@ -461,7 +466,7 @@ lava-zephyr-qemu-cortex-m3:
lava-zephyr-qemu-x86:
needs: [zephyr-qemu-x86-gcc]
stage: test
- extends: .lava-test
+ extends: .lava-test-mr
variables:
MACHINE: qemu-x86
CI_BUILD_JOB_NAME: zephyr-qemu-x86-gcc
@@ -471,7 +476,7 @@ lava-zephyr-qemu-x86:
lava-qemu-x86-sysota:
needs: [bundle-qemu-x86]
stage: test
- extends: .lava-test
+ extends: .lava-test-mr
variables:
MACHINE: qemux86
CI_BUILD_JOB_NAME: linux-qemu-x86
@@ -482,7 +487,7 @@ lava-qemu-x86-sysota:
lava-qemu-x86_64-sysota:
needs: [bundle-qemu-x86_64]
stage: test
- extends: .lava-test
+ extends: .lava-test-mr
variables:
MACHINE: qemux86-64
CI_BUILD_JOB_NAME: linux-qemu-x86_64
diff --git a/.oniro-ci/test-generic.yaml b/.oniro-ci/test-generic.yaml
index 3f93cf65..87ae423f 100644
--- a/.oniro-ci/test-generic.yaml
+++ b/.oniro-ci/test-generic.yaml
@@ -13,6 +13,7 @@
CI_LAVA_INSTANCE: "https://lava.ostc-eu.org/"
CI_SQUAD_INSTANCE: "https://squadp.svc.ostc-eu.dev"
CI_SQUAD_PROJECT_NAME: "oniro-test-mr"
+ CI_LAVA_JOB_PRIORITY: "medium"
# 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"
@@ -53,6 +54,7 @@
- sed -i -e 's/@ci_job_id@/'"$CI_JOB_ID"'/'
-e 's/@ci_project_id@/'"$CI_PROJECT_ID"'/'
-e 's/@ci_pipeline_id@/'"$CI_PIPELINE_ID"'/'
+ -e 's/@ci_lava_job_priority@/'"$CI_LAVA_JOB_PRIORITY"'/'
-e 's,@ci_pipeline_url@,'"$CI_PIPELINE_URL"','
-e 's,@update_job_id@,'"$update_job_id"','
-e 's/@build_job_id@/'"$build_job_id"'/' job_def.yaml
--
GitLab