diff mbox series

[3/8] Migrate riscv64 targets to Trixie

Message ID 20250410105025.47019-4-amikan@ilbers.de
State New
Headers show
Series Testsuite coverage update | expand

Commit Message

Anton Mikanovich April 10, 2025, 10:50 a.m. UTC 
From: Maria Selvam <mariasm@ilbers.de>

Migrate multiconfig targets from Sid to Trixie and cover them with CI.

Signed-off-by: Maria Selvam <mariasm@ilbers.de>
---
 meta-isar/conf/mc.conf                           |  6 +++---
 ...uriscv64-sid.conf => qemuriscv64-trixie.conf} |  4 ++--
 meta-isar/conf/multiconfig/sifive-fu540-sid.conf |  7 -------
 .../conf/multiconfig/sifive-fu540-trixie.conf    |  7 +++++++
 .../multiconfig/starfive-visionfive2-sid.conf    |  7 -------
 .../multiconfig/starfive-visionfive2-trixie.conf |  7 +++++++
 testsuite/citest.py                              | 16 +++-------------
 7 files changed, 22 insertions(+), 32 deletions(-)
 rename meta-isar/conf/multiconfig/{qemuriscv64-sid.conf => qemuriscv64-trixie.conf} (67%)
 delete mode 100644 meta-isar/conf/multiconfig/sifive-fu540-sid.conf
 create mode 100644 meta-isar/conf/multiconfig/sifive-fu540-trixie.conf
 delete mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf
 create mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf
diff mbox series

Patch

diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index 7c190b67..fb829b30 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -29,7 +29,7 @@  BBMULTICONFIG = " \
     container-amd64-bookworm \
     qemumipsel-bullseye \
     qemumipsel-bookworm \
-    qemuriscv64-sid \
+    qemuriscv64-trixie \
     bananapi-buster \
     bananapi-bullseye \
     bananapi-bookworm \
@@ -59,8 +59,8 @@  BBMULTICONFIG = " \
     rpi-arm-v7l-bookworm \
     rpi-arm64-v8-bullseye \
     rpi-arm64-v8-bookworm \
-    sifive-fu540-sid \
-    starfive-visionfive2-sid \
+    sifive-fu540-trixie \
+    starfive-visionfive2-trixie \
     qemuarm64-focal \
     qemuarm64-jammy \
     qemuarm64-noble \
diff --git a/meta-isar/conf/multiconfig/qemuriscv64-sid.conf b/meta-isar/conf/multiconfig/qemuriscv64-trixie.conf
similarity index 67%
rename from meta-isar/conf/multiconfig/qemuriscv64-sid.conf
rename to meta-isar/conf/multiconfig/qemuriscv64-trixie.conf
index bc691b5b..73039274 100644
--- a/meta-isar/conf/multiconfig/qemuriscv64-sid.conf
+++ b/meta-isar/conf/multiconfig/qemuriscv64-trixie.conf
@@ -1,8 +1,8 @@ 
 # This software is a part of ISAR.
-# Copyright (C) 2017 ilbers GmbH
+# Copyright (C) 2017-2025 ilbers GmbH 
 # Copyright (c) Siemens AG, 2019-2020
 #
 # SPDX-License-Identifier: MIT
 
 MACHINE ?= "qemuriscv64"
-DISTRO ?= "debian-sid"
+DISTRO ?= "debian-trixie"
diff --git a/meta-isar/conf/multiconfig/sifive-fu540-sid.conf b/meta-isar/conf/multiconfig/sifive-fu540-sid.conf
deleted file mode 100644
index 99bb7f3e..00000000
--- a/meta-isar/conf/multiconfig/sifive-fu540-sid.conf
+++ /dev/null
@@ -1,7 +0,0 @@ 
-#
-# Copyright (c) Siemens AG, 2020
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE ?= "sifive-fu540"
-DISTRO ?= "debian-sid"
diff --git a/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf b/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf
new file mode 100644
index 00000000..841d2e5c
--- /dev/null
+++ b/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf
@@ -0,0 +1,7 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2025 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "sifive-fu540"
+DISTRO ?= "debian-trixie"
diff --git a/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf
deleted file mode 100644
index 603e891f..00000000
--- a/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf
+++ /dev/null
@@ -1,7 +0,0 @@ 
-#
-# Copyright (c) Siemens AG, 2023
-#
-# SPDX-License-Identifier: MIT
-
-MACHINE ?= "starfive-visionfive2"
-DISTRO ?= "debian-sid"
diff --git a/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf
new file mode 100644
index 00000000..f2ccb2b8
--- /dev/null
+++ b/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf
@@ -0,0 +1,7 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2025 ilbers GmbH
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE ?= "starfive-visionfive2"
+DISTRO ?= "debian-trixie"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index d0c33b1e..68881bca 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -311,19 +311,9 @@  class NoCrossTest(CIBaseTest):
             'mc:qemuamd64-trixie:isar-image-base',
             'mc:qemuarm64-trixie:isar-image-base',
             'mc:qemuarm-trixie:isar-image-base',
-        ]
-
-        self.init()
-        try:
-            self.perform_build_test(targets, cross=False)
-        except exceptions.TestFail:
-            self.cancel('KFAIL')
-
-    def test_nocross_sid(self):
-        targets = [
-            'mc:qemuriscv64-sid:isar-image-base',
-            'mc:sifive-fu540-sid:isar-image-base',
-            'mc:starfive-visionfive2-sid:isar-image-base',
+            'mc:qemuriscv64-trixie:isar-image-base',
+            'mc:sifive-fu540-trixie:isar-image-base',
+            'mc:starfive-visionfive2-trixie:isar-image-base',
         ]
 
         self.init()