CHROMEOS test-configs-chromeos.yaml: Remove chromeos suffix from flus…

…ter decoder tests The fluster+GStreamer decoder test plans running on the collabora-chromeos- kernel tree have a "chromeos" suffix. The suffix was added to distinguish these tests from the analogous ones running in the main instance. The suffix may cause confusion as the tests are running on Debian and not on ChromeOS; remove it and reuse the test plan definitions from test-configs.yaml. Signed-off-by: Laura Nao <[email protected]>
laura-nao · Jan 29, 2024 · f4b04fe · f4b04fe
1 parent cc54581
commit f4b04fe
Showing 1 changed file with 12 additions and 58 deletions.
diff --git a/config/core/test-configs-chromeos.yaml b/config/core/test-configs-chromeos.yaml
@@ -566,52 +566,6 @@ test_plans:
       <<: *cros-tast-base-qemu-params
       tests: *cros-tast-video-tests
 
-  v4l2-decoder-conformance-av1_chromeos: &v4l2-decoder-conformance_chromeos
-    rootfs: debian_bullseye-gst-fluster_nfs
-    pattern: 'v4l2-decoder-conformance/{category}-{method}-{protocol}-{rootfs}-v4l2-decoder-conformance-template.jinja2'
-    params: &v4l2-decoder-conformance-params_chromeos
-      job_timeout: '30'
-      testsuite: 'AV1-TEST-VECTORS'
-      decoders:
-        - 'GStreamer-AV1-V4L2SL-Gst1.0'
-      videodec_parallel_jobs: '1'
-      videodec_timeout: 90
-
-  v4l2-decoder-conformance-h264_chromeos:
-    <<: *v4l2-decoder-conformance_chromeos
-    params:
-      <<: *v4l2-decoder-conformance-params_chromeos
-      testsuite: 'JVT-AVC_V1'
-      decoders:
-        - 'GStreamer-H.264-V4L2-Gst1.0'
-        - 'GStreamer-H.264-V4L2SL-Gst1.0'
-
-  v4l2-decoder-conformance-h265_chromeos:
-    <<: *v4l2-decoder-conformance_chromeos
-    params:
-      <<: *v4l2-decoder-conformance-params_chromeos
-      testsuite: 'JCT-VC-HEVC_V1'
-      decoders:
-        - 'GStreamer-H.265-V4L2-Gst1.0'
-        - 'GStreamer-H.265-V4L2SL-Gst1.0'
-
-  v4l2-decoder-conformance-vp8_chromeos:
-    <<: *v4l2-decoder-conformance_chromeos
-    params:
-      <<: *v4l2-decoder-conformance-params_chromeos
-      testsuite: 'VP8-TEST-VECTORS'
-      decoders:
-        - 'GStreamer-VP8-V4L2-Gst1.0'
-        - 'GStreamer-VP8-V4L2SL-Gst1.0'
-
-  v4l2-decoder-conformance-vp9_chromeos:
-    <<: *v4l2-decoder-conformance_chromeos
-    params:
-      <<: *v4l2-decoder-conformance-params_chromeos
-      testsuite: 'VP9-TEST-VECTORS'
-      decoders:
-        - 'GStreamer-VP9-V4L2SL-Gst1.0'
-
 device_types:
 
   acer-R721T-grunt_chromeos: &chromebook-grunt-type
@@ -1243,7 +1197,7 @@ test_configs:
   - device_type: mt8183-kukui-jacuzzi-juniper-sku16_chromeos
     filters: *collabora-chromeos-kernel-filter
     test_plans:
-      - v4l2-decoder-conformance-h264_chromeos
+      - v4l2-decoder-conformance-h264
 
   - device_type: mt8183-kukui-jacuzzi-juniper-sku16_chromeos
     filters: *collabora-chromeos-kernel-filter
@@ -1263,9 +1217,9 @@ test_configs:
   - device_type: mt8186-corsola-steelix-sku131072_chromeos
     filters: *collabora-chromeos-kernel-filter
     test_plans:
-      - v4l2-decoder-conformance-h264_chromeos
-      - v4l2-decoder-conformance-vp8_chromeos
-      - v4l2-decoder-conformance-vp9_chromeos
+      - v4l2-decoder-conformance-h264
+      - v4l2-decoder-conformance-vp8
+      - v4l2-decoder-conformance-vp9
 
   - device_type: mt8192-asurada-spherion-r0_chromeos
     filters: *collabora-chromeos-kernel-filter
@@ -1289,9 +1243,9 @@ test_configs:
   - device_type: mt8192-asurada-spherion-r0_chromeos
     filters: *collabora-chromeos-kernel-filter
     test_plans:
-      - v4l2-decoder-conformance-h264_chromeos
-      - v4l2-decoder-conformance-vp8_chromeos
-      - v4l2-decoder-conformance-vp9_chromeos
+      - v4l2-decoder-conformance-h264
+      - v4l2-decoder-conformance-vp8
+      - v4l2-decoder-conformance-vp9
 
 # Test plans temporarily disabled as QEMU build doesnt work
 #  - device_type: qemu_x86_64-uefi-chromeos
@@ -1326,11 +1280,11 @@ test_configs:
   - device_type: mt8195-cherry-tomato-r2_chromeos
     filters: *collabora-chromeos-kernel-filter
     test_plans:
-      - v4l2-decoder-conformance-av1_chromeos
-      - v4l2-decoder-conformance-h264_chromeos
-      - v4l2-decoder-conformance-h265_chromeos
-      - v4l2-decoder-conformance-vp8_chromeos
-      - v4l2-decoder-conformance-vp9_chromeos
+      - v4l2-decoder-conformance-av1
+      - v4l2-decoder-conformance-h264
+      - v4l2-decoder-conformance-h265
+      - v4l2-decoder-conformance-vp8
+      - v4l2-decoder-conformance-vp9
 
   - device_type: sc7180-trogdor-kingoftown_chromeos
     test_plans: *chromebook-arm64-test-plans