From 4dc8dda993ca3726df9b17538a52c9b667c8a166 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 10 Jun 2021 12:18:21 +0200 Subject: [PATCH] ci: reorder pipeline --- .gitlab-ci.yml | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7aced4d48..61604704f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,6 @@ stages: - sanity - test - respdiff - - extended - deploy - pkgtest @@ -306,6 +305,21 @@ test:valgrind: - ${MESON_TEST} --suite unit --suite config --no-suite snowflake --wrap="valgrind --leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp" - MESON_TESTTHREADS=1 ${MESON_TEST} --wrap="valgrind --leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp" --suite snowflake +pkgtest: + stage: test + trigger: + include: ci/pkgtest.yaml + strategy: depend + needs: + - build + except: + refs: + - master@knot/knot-resolver + - master@knot/security/knot-resolver + - tags + variables: + - $SKIP_CI == "1" + pytests: <<: *test_flaky needs: @@ -442,23 +456,6 @@ rp:iter.udp-asan: RESPERF_TEST: resperf.iter.udp # }}} -# extended {{{ -pkgtest: - stage: extended - trigger: - include: ci/pkgtest.yaml - strategy: depend - needs: - - build - except: - refs: - - master@knot/knot-resolver - - master@knot/security/knot-resolver - - tags - variables: - - $SKIP_CI == "1" -# }}} - # deploy {{{ # copy snapshot of current master to nightly branch for further processing # (this is workaround for missing complex conditions for job limits in Gitlab) -- 2.47.2