From 40a699862746807c2ec1ec81be5fe810eade006a Mon Sep 17 00:00:00 2001 From: Pierre Equoy Date: Mon, 22 Jan 2024 22:06:23 +0800 Subject: [PATCH] Rename ARM Vector Floating Point templates to avoid clash (BugFix) (#949) * Rename ARM Vector Floating Point template units to avoid clash These two templates use the same `id` which is a problem when ensuring every template has a unique id field. * Update test plans accordingly --- providers/base/units/cpu/jobs.pxu | 4 ++-- providers/base/units/cpu/test-plan.pxu | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/providers/base/units/cpu/jobs.pxu b/providers/base/units/cpu/jobs.pxu index 9153a5d254..02fd3409b1 100644 --- a/providers/base/units/cpu/jobs.pxu +++ b/providers/base/units/cpu/jobs.pxu @@ -176,7 +176,7 @@ template-filter: cpuinfo.platform == 'armv7l' template-unit: job plugin: shell category_id: com.canonical.plainbox::cpu -id: cpu/arm_vfp_support_{platform} +id: cpu/armhf_vfp_support_{platform} estimated_duration: 1.0 user: root command: @@ -192,7 +192,7 @@ template-filter: cpuinfo.platform == 'aarch64' template-unit: job plugin: shell category_id: com.canonical.plainbox::cpu -id: cpu/arm_vfp_support_{platform} +id: cpu/arm64_vfp_support_{platform} estimated_duration: 1.0 user: root command: diff --git a/providers/base/units/cpu/test-plan.pxu b/providers/base/units/cpu/test-plan.pxu index 14a038c7ed..42a30fcf41 100644 --- a/providers/base/units/cpu/test-plan.pxu +++ b/providers/base/units/cpu/test-plan.pxu @@ -85,7 +85,8 @@ include: cpu/clocktest cpu/offlining_test cpu/topology - cpu/arm_vfp_support_.* + cpu/armhf_vfp_support_.* + cpu/arm64_vfp_support_.* cpu/cstates cpu/cstates_results.log @@ -99,6 +100,7 @@ include: cpu/maxfreq_test certification-status=blocker cpu/maxfreq_test-log-attach certification-status=non-blocker cpu/topology certification-status=blocker - cpu/arm_vfp_support_.* certification-status=non-blocker + cpu/armhf_vfp_support_.* certification-status=non-blocker + cpu/arm64_vfp_support_.* certification-status=non-blocker cpu/cstates certification-status=non-blocker - cpu/cstates_results.log certification-status=non-blocker \ No newline at end of file + cpu/cstates_results.log certification-status=non-blocker