From: Maria Matejka <mq@ucw.cz>
Date: Sat, 14 Jun 2025 12:57:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into thread-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480fbf3a8934b008317a791f69a5d07e57242a5f;p=thirdparty%2Fbird.git

Merge remote-tracking branch 'origin/master' into thread-next
---

480fbf3a8934b008317a791f69a5d07e57242a5f
diff --cc .gitlab-ci.yml
index 78f0073ac,8666c0bda..4d9237b9f
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1399,10 -1397,14 +1401,14 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
    after_script:
+     - DIR=$(pwd)
      - cd $TOOLS_DIR/netlab
      - sudo ./stop
+     - "mkdir $DIR/netlab-failure"
+     - git status --porcelain > $DIR/netlab-failure.log
+     - for f in $(git status --porcelain | sed -rn 's#^.[^DRT] netlab/##p'); do mkdir -p $DIR/netlab-failure/$(dirname $f); sudo chmod a+rw $f; sudo mv $f $DIR/netlab-failure/$(dirname $f); done
    artifacts:
      when: on_failure
      untracked: true
diff --cc misc/gitlab/template.yml.j2
index 7c0cd58eb,743c442d1..4ef0644aa
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@@ -432,10 -434,14 +434,14 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
    after_script:
+     - DIR=$(pwd)
      - cd $TOOLS_DIR/netlab
      - sudo ./stop
+     - "mkdir $DIR/netlab-failure"
+     - git status --porcelain > $DIR/netlab-failure.log
+     - for f in $(git status --porcelain | sed -rn 's#^.[^DRT] netlab/##p'); do mkdir -p $DIR/netlab-failure/$(dirname $f); sudo chmod a+rw $f; sudo mv $f $DIR/netlab-failure/$(dirname $f); done
    artifacts:
      when: on_failure
      untracked: true