CI: Always checkout master of bird-tools for netlab

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 010aa85d2a5ffc16c4d303f8d077a15e814dc40f..f79cbdc2e0815bbed19b6eea67daaa3eb27324a5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1597,6 +1597,7 @@ build-netlab:
     - DIR=$(pwd)
     - cd $TOOLS_DIR
     - sudo git clean -fx
+    - sudo git checkout -f master
     - git pull --ff-only
     - "mv $DIR/build-netlab/* netlab/common/"
     - ln -s $STAYRTR_BINARY netlab/common/stayrtr

diff --git a/misc/gitlab/template.yml.j2 b/misc/gitlab/template.yml.j2
index 6529e8fc1bf739296b7631dc083f2e6955bcbd80..65f3d7985b5480f1856c4f45a56d332b098e2d2a 100644 (file)
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@ -413,6 +413,7 @@ build-netlab:
     - DIR=$(pwd)
     - cd $TOOLS_DIR
     - sudo git clean -fx
+    - sudo git checkout -f master
     - git pull --ff-only
     - "mv $DIR/build-netlab/* netlab/common/"
     - ln -s $STAYRTR_BINARY netlab/common/stayrtr