From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 10 Jun 2021 10:18:21 +0000 (+0200)
Subject: ci: reorder pipeline
X-Git-Tag: v5.4.0~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dc8dda993ca3726df9b17538a52c9b667c8a166;p=thirdparty%2Fknot-resolver.git

ci: reorder pipeline
---

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)