CI: Support stage selection with merge requests

Currently the stage/board selection only works with normal pushes, since
gitlab unfortunately drops CI variables when starting an MR pipeline.

Fix this by looking for tags in the MR description. This only supports
stage-selection, not individual boards.

Simplify the workflow since the previous changes are now not needed.
Cover-letter:
Updates for the new utool
This series includes a patch to make CI work with the way utool
operates, specifically to allow merge requests to honour its requests.

It also drops an unwanted test file.
END

Signed-off-by: Simon Glass <simon.glass@canonical.com>

.gitlab-ci.yml

@@ -3,6 +3,14 @@
 include:
   - local: '.gitlab-ci-release.yml'
 
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"
+      when: always
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: always
+    - when: never
+
 variables:
   DEFAULT_TAG: ""
   MIRROR_DOCKER: docker.io
@@ -41,6 +49,9 @@ stages:
   #   - privileged = true in /etc/gitlab-runner/config.toml
   #   OR passwordless sudo for: modprobe, cryptsetup, dd
   rules:
+    # Skip if MR description contains [skip-pytest]
+    - if: $CI_MERGE_REQUEST_DESCRIPTION =~ /\[skip-pytest\]/
+      when: never
     - if: $PYTEST == "1"
       when: always
     - if: $PYTEST == $CI_JOB_NAME
@@ -142,6 +153,9 @@ stages:
 .world_build:
   stage: world_build
   rules:
+    # Skip if MR description contains [skip-world]  
+    - if: $CI_MERGE_REQUEST_DESCRIPTION =~ /\[skip-world\]/
+      when: never
     - if: $WORLD == "1"
       when: always
     - when: never
@@ -224,6 +238,9 @@ build all other platforms:
 .test_suites:
   stage: test_suites
   rules:
+    # Skip if MR description contains [skip-suites]
+    - if: $CI_MERGE_REQUEST_DESCRIPTION =~ /\[skip-suites\]/
+      when: never
     - if: $SUITES == "1"
       when: always
     - when: never
@@ -369,6 +386,9 @@ Examples:
 .python_check_template:
   stage: test.py
   rules:
+    # Skip if MR description contains [skip-pytest]
+    - if: $CI_MERGE_REQUEST_DESCRIPTION =~ /\[skip-pytest\]/
+      when: never
     - if: $PYTEST == "1"
       when: always
     - if: $PYTEST == $CI_JOB_NAME
@@ -714,6 +734,9 @@ coreboot test.py:
   stage: sjg-lab
   needs: []
   rules:
+    # Skip if MR description contains [skip-sjg]
+    - if: $CI_MERGE_REQUEST_DESCRIPTION =~ /\[skip-sjg\]/
+      when: never
     - if: $SJG_LAB == $ROLE || $SJG_LAB == "1"
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"

test-file

@@ -1 +0,0 @@
-test