ci: Run 'validate' and 'ges' integration testsuites

And use new validate feature to print debug logs URL directly
in the logs instead of dumping the whole files.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe6844a..e8d4044 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -184,3 +184,12 @@ android universal examples local:
   except:
     refs:
       - "master@gstreamer/gst-ci"
+
+integration testsuites fedora local:
+  extends: '.test fedora x86_64 local'
+  before_script:
+    - rm -f gst-build/build/subprojects/gstreamer-vaapi/gst/vaapi/libgstvaapi.so
+  variables:
+    EXTRA_VALIDATE_ARGS: "--timeout-factor=2 --retry-on-failures"
+    TEST_SUITE: "validate ges"
+

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index f7f1940..cdb06bc 100644 (file)
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -81,7 +81,6 @@ gst indent:
     CXX: "ccache g++"
     CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
     CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
-    MAIN_DIR: "${CI_PROJECT_DIR}/validate-output/"
     MESON_ARGS: "${DEFAULT_MESON_ARGS}"
 
   script:
@@ -131,9 +130,10 @@ build nodebug fedora x86_64:
 .test:
   stage: 'test'
   variables:
-    MAIN_DIR: "${CI_PROJECT_DIR}/validate-output/"
     # Disable colored output to avoid weird rendering issues
-    GST_DEBUG_COLOR: 'no'
+    GST_DEBUG_NO_COLOR: "true"
+    CI_ARTIFACTS_URL: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/validate-logs/"
+    GST_VALIDATE_LAUNCHER_FORCE_COLORS: "true"
 
     # note the -b at the start of each line
     # Can't comment inline sadly
@@ -226,6 +226,7 @@ build nodebug fedora x86_64:
       -b check.gst-devtools.validate.launcher_tests.test_validate.launch_pipeline.not_negotiated.caps_query_failure.play_15s
   script:
     - cd gst-build/
+    - echo "-> Running ${TEST_SUITE} testsuite."
     - >
       ./gst-uninstalled.py
       gst-validate-launcher ${TEST_SUITE}
@@ -233,10 +234,10 @@ build nodebug fedora x86_64:
       --mute
       --shuffle
       --no-display
-      --dump-on-failure
       --meson-no-rebuild
-      -M "${CI_PROJECT_DIR}/validate-output/"
-      --xunit-file "${CI_PROJECT_DIR}/validate-output/logs/xunit.xml"
+      --fail-on-testlist-change
+      -l "${CI_PROJECT_DIR}/validate-logs/"
+      --xunit-file "${CI_PROJECT_DIR}/validate-logs/xunit.xml"
       ${BLACKLIST}
       ${EXTRA_VALIDATE_ARGS}
   artifacts:
@@ -244,10 +245,10 @@ build nodebug fedora x86_64:
     when: always
     paths:
       - 'gst-build/build/meson-logs/'
-      - 'validate-output/logs'
+      - 'validate-logs'
     reports:
       junit:
-        - "validate-output/logs/*.xml"
+        - "validate-logs/*.xml"
   # We disable the .build above, which this job usually depends upon for cerbero
   except:
     variables:
@@ -265,6 +266,14 @@ check fedora:
   variables:
     TEST_SUITE: "check.gst*"
 
+integration testsuites fedora:
+  extends: '.test fedora x86_64'
+  before_script:
+    - rm -f gst-build/build/subprojects/gstreamer-vaapi/gst/vaapi/libgstvaapi.so
+  variables:
+    EXTRA_VALIDATE_ARGS: "--timeout-factor=2 --retry-on-failures"
+    TEST_SUITE: "validate ges"
+
 # Valgrind
 .valgrind fedora x86_64:
   extends: '.test fedora x86_64'