From: Maria Matejka <mq@ucw.cz>
Date: Thu, 12 Jun 2025 09:52:32 +0000 (+0200)
Subject: CI: Fix netlab failure artifact collection
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b55700bbeb718b5d95c94df8dd66e4ba0d9b7176;p=thirdparty%2Fbird.git

CI: Fix netlab failure artifact collection

When implementing artifact collection for netlab,
I forgot that the coredumps and logs are generated outside the
repository. Moving the artifacts to the right place for collection.

Introduced in 3d88a81f102783bd4af3d99db1e1f14d14050d6c.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1535b42bf..d3c07be74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1387,6 +1387,7 @@ build-netlab:
     - netlab
     - amd64
   script:
+    - sudo rm -rf netlab-failure
     - DIR=$(pwd)
     - cd $TOOLS_DIR
     - sudo git clean -fx
@@ -1397,8 +1398,12 @@ build-netlab:
     - sudo ./stop
     - sudo ./runtest -s v2 -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 --git a/misc/gitlab/template.yml.j2 b/misc/gitlab/template.yml.j2
index e5619696b..00019486f 100644
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@ -424,6 +424,7 @@ build-netlab:
     - netlab
     - amd64
   script:
+    - sudo rm -rf netlab-failure
     - DIR=$(pwd)
     - cd $TOOLS_DIR
     - sudo git clean -fx
@@ -434,8 +435,12 @@ build-netlab:
     - sudo ./stop
     - sudo ./runtest -s v2 -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