From: Petr Špaček <petr.spacek@nic.cz>
Date: Tue, 7 Aug 2018 16:02:13 +0000 (+0200)
Subject: fixup! ci: do not re-run tests on master, use nightly instead
X-Git-Tag: v3.0.0~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b896aacca0f176993784568eaacc7dba54b1be63;p=thirdparty%2Fknot-resolver.git

fixup! ci: do not re-run tests on master, use nightly instead
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b9b445f4..5b598bf0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,11 +163,13 @@ doc:
 deckard:linux:amd64:
   stage: test
   except:
-    - master@knot/knot-resolver
+    refs:
+      - master@knot/knot-resolver
+    variables:
+      # prevent unstable test from cancelling nightly OBS build
+      - $SKIP_DECKARD == "1"
   variables:
     TMPDIR: $CI_PROJECT_DIR
-  except:
-    - schedules  # prevent unstable test from cancelling nightly OBS build
   script:
     - DECKARDFLAGS="-n $(nproc)" PATH="$PREFIX/sbin:$PATH" make check-integration
   # these errors are side-effect of Git way of handling file timestamps
@@ -510,9 +512,11 @@ nightly:copy:
   dependencies: []
   script:
     # delete nightly branch
+    - 'curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" "https://gitlab.labs.nic.cz/api/v4/projects/147/repository/branches/nightly/unprotect"'
     - 'curl --request DELETE --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" "https://gitlab.labs.nic.cz/api/v4/projects/147/repository/branches/nightly"'
     # recreate nightly branch from current master
     - 'curl --request POST --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" "https://gitlab.labs.nic.cz/api/v4/projects/147/repository/branches?branch=nightly&ref=master"'
+    - 'curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" "https://gitlab.labs.nic.cz/api/v4/projects/147/repository/branches/nightly/protect"'
 
 
 #arm_build: