From 97547291767520b636cbd72ee54b49e55c8dfb5a Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 28 Feb 2019 16:46:50 +0100
Subject: [PATCH] gitlabci: run symbols and root.hints check jobs pre-release

---
 .gitlab-ci.yml | 56 ++++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e8b826b1..39e70a95d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,13 +86,12 @@ build-asan:
 
 kres-gen:
   <<: *build
-  artifacts:
   tags:
     - docker
   script:
-    - meson build_ci --prefix=$PREFIX
-    - ninja -C build_ci lib/libkres.so.${LIBKRES_ABI}
-    - ninja -C build_ci kres-gen
+    - meson build_ci_lib --prefix=$PREFIX
+    - ninja -C build_ci_lib lib/libkres.so.${LIBKRES_ABI}
+    - ninja -C build_ci_lib kres-gen
     - git diff --quiet || (git diff; exit 1)
 # }}}
 
@@ -236,6 +235,19 @@ lint:tidy:
   tags:
     - privileged  # mock requires additional capabilities (e.g. mount)
 
+pkg:debian.symbols:
+  <<: *test
+  dependencies:
+    - kres-gen
+  before_script: []
+  only:
+    refs:
+      - /^release.*$/
+  script:
+    - ln -s distro/deb debian
+    - sed -i "s/__VERSION__/99/g" distro/deb/changelog
+    - dpkg-gensymbols -c4 -ebuild_ci_lib/lib/$LIBKRES_NAME.so.$LIBKRES_ABI -P. -p$LIBKRES_NAME$LIBKRES_ABI
+
 pkg:epel-7:
   <<: *pkgbuild
   script:
@@ -278,6 +290,14 @@ respdiff:basic:
     - linux
     - amd64
 
+root.hints:
+  <<: *test_nodep
+  only:
+    refs:
+      - /^release.*$/
+  script:
+    - scripts/update-root-hints.sh
+
 test:valgrind:
   <<: *test
   when: delayed
@@ -428,34 +448,6 @@ pkg:obs:devel:
     - scripts/build-in-obs.sh knot-dns-devel  # build against latest development version of knot
     - scripts/build-in-obs.sh knot-resolver-devel  # build against knot in knot-resolver-latest
 
-pkg:debian.symbols:
-  stage: deploy
-  only:  # TODO run this pre-release only
-    variables:
-      - $OBS_BUILD == "1"
-    refs:
-      - nightly@knot/knot-resolver
-  except:
-    - master
-  script:
-    - ln -s distro/deb debian
-    - sed -i "s/__VERSION__/99/g" distro/deb/changelog
-    - dpkg-gensymbols -c4 -elib/$LIB_NAME.so.$LIBKRES_ABI -P. -p$LIBKRES_NAME$LIBKRES_ABI
-  allow_failure: true
-  dependencies:
-    - build
-
-root.hints:
-  stage: deploy
-  only:
-    variables:
-      - $OBS_BUILD == "1"
-    refs:
-      - nightly@knot/knot-resolver
-  allow_failure: true
-  script:
-    - scripts/update-root-hints.sh
-
 # copy snapshot of current master to nightly branch for further processing
 # (this is workaround for missing complex conditions for job limits in Gitlab)
 nightly:copy:
-- 
2.47.2