In commit 399f739be6b2 ("CI: allow jobs to be run in merge requests") we added "rules:when: always" to many stages of the pipeline to allow for merge requests to trigger a run. However based on current Gitlab documentation, we should still be triggered on merge requests without this. Furthermore the way we have things written today we always run all stages of the CI rather than failing out early on problems, which is not always useful. Remove these as we should still be fine with merge requests triggering a run.

Link: https://docs.gitlab.com/ee/ci/yaml/#rules Signed-off-by: Tom Rini trini@konsulko.com --- Can you please test this in your setup? I'm actually a little unsure of what your setup needs now that I look at this harder, thanks.

Cc: Francesco Dolcini francesco.dolcini@toradex.com --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57037e243ecb..2f324b0e1a90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,6 @@ stages: .buildman_and_testpy_template: &buildman_and_testpy_dfn stage: test.py retry: 2 # QEMU may be too slow, etc. - rules: - - when: always before_script: # Clone uboot-test-hooks - git config --global --add safe.directory "${CI_PROJECT_DIR}" @@ -104,8 +102,6 @@ stages:

.world_build: stage: world build - rules: - - when: always

build all 32bit ARM platforms: extends: .world_build @@ -157,8 +153,6 @@ build all other platforms:

.testsuites: stage: testsuites - rules: - - when: always

check for new CONFIG symbols outside Kconfig: extends: .testsuites