From 6fa33eed13b514faf294973c6bd8c7f4a94c0290 Mon Sep 17 00:00:00 2001
From: alichinese <lixinyu44@huawei.com>
Date: Fri, 24 May 2024 09:43:19 +0800
Subject: [PATCH] ci: remove mcs feature in x86 with kernel6.6

* the arch x86 with kernel6.6 will raise mcs-km build faild,
  the mcs feature is not necessary in kernel6.6

Signed-off-by: alichinese <lixinyu44@huawei.com>
---
 .oebuild/workflows/jenkinsfile_ci       | 6 +++---
 .oebuild/workflows/jenkinsfile_ci_input | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.oebuild/workflows/jenkinsfile_ci b/.oebuild/workflows/jenkinsfile_ci
index 3a17192c971..93e954e3fce 100644
--- a/.oebuild/workflows/jenkinsfile_ci
+++ b/.oebuild/workflows/jenkinsfile_ci
@@ -505,7 +505,7 @@ pipeline {
                         }
                     }
                 }
-                stage("qemu-riscv64 x86-64-rt-hmi-ros-mcs x86-64-rt-hmi-ros-mcs-kernel6.6"){
+                stage("qemu-riscv64 x86-64-rt-hmi-ros-mcs x86-64-rt-hmi-ros-kernel6.6"){
                     agent { node "${node}" }
                     steps {
                         dir('/home/jenkins/agent'){
@@ -559,7 +559,7 @@ pipeline {
                                     handleAfterBuildImage(stageName, arch, task_res_code, logDir, randomStr, IMAGE_DATE, STAGES_RES)
                                 
                                     // 执行x86-64-rt-hmi-ros-mcs-kernel6.6镜像编译检查
-                                    stageName = "x86-64-rt-hmi-ros-mcs-kernel6.6"
+                                    stageName = "x86-64-rt-hmi-ros-kernel6.6"
                                     arch = "x86-64"
                                     task_res_code = sh (script: """
                                         python3 main.py build \
@@ -568,7 +568,7 @@ pipeline {
                                         -a $arch \
                                         -t /usr1/openeuler/gcc/openeuler_gcc_x86_64 \
                                         -p x86-64 \
-                                        -f "kernel6;openeuler-rt;hmi;openeuler-ros;openeuler-mcs" \
+                                        -f "kernel6;openeuler-rt;hmi;openeuler-ros" \
                                         -i "openeuler-image;openeuler-image -c do_populate_sdk" \
                                         -s_out "/home/jenkins/ccache/openeuler_embedded/$ciBranch/sstate-cache/$stageName" \
                                         -dt $IMAGE_DATE \
diff --git a/.oebuild/workflows/jenkinsfile_ci_input b/.oebuild/workflows/jenkinsfile_ci_input
index 201ee37822b..725ba04f28c 100644
--- a/.oebuild/workflows/jenkinsfile_ci_input
+++ b/.oebuild/workflows/jenkinsfile_ci_input
@@ -630,8 +630,8 @@ pipeline {
                 }
             }
         }
-        //##############x86-64-rt-hmi-ros-mcs-kernel6.6###################
-        stage("x86-64-rt-hmi-ros-mcs-kernel6.6"){
+        //##############x86-64-rt-hmi-ros-kernel6.6###################
+        stage("x86-64-rt-hmi-ros-kernel6.6"){
             when {
                 equals expected: "x86-64-rt-hmi-ros-mcs-kernel6.6", actual: IMAGE_NAME
             }
@@ -645,7 +645,7 @@ pipeline {
                             def logDir = mkdirOpeneulerLog()
                             
                             // 执行x86-64-rt-hmi-ros-mcs镜像编译检查
-                            def stageName = "x86-64-rt-hmi-ros-mcs-kernel6.6"
+                            def stageName = "x86-64-rt-hmi-ros-kernel6.6"
                             def arch = "x86-64"
                             def task_res_code = sh (script: """
                                 python3 main.py build \
@@ -654,7 +654,7 @@ pipeline {
                                 -a $arch \
                                 -t /usr1/openeuler/gcc/openeuler_gcc_x86_64 \
                                 -p x86-64 \
-                                -f "kernel6;openeuler-rt;hmi;openeuler-ros;openeuler-mcs" \
+                                -f "kernel6;openeuler-rt;hmi;openeuler-ros" \
                                 -i "openeuler-image;openeuler-image -c do_populate_sdk" \
                                 -s_out "/home/jenkins/ccache/openeuler_embedded/$ciBranch/sstate-cache/$stageName" \
                                 -dt $IMAGE_DATE \
-- 
Gitee