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 226966332893068198e951c236d3f29b3c33553b..34d91453b7c764745e065c286d5d3a11a6911e74 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1391,6 +1391,7 @@ build-netlab:
     - netlab
     - amd64
   script:
+    - sudo rm -rf netlab-failure
     - DIR=$(pwd)
     - cd $TOOLS_DIR
     - sudo git clean -fx
@@ -1401,8 +1402,12 @@ build-netlab:
     - sudo ./stop
     - 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 --git a/misc/gitlab/template.yml.j2 b/misc/gitlab/template.yml.j2
index 7c0cd58eb92b7c5a14c847c08a0ec001ef61a885..8a99292e1b861dc494517be276d0cd468130ef9a 100644 (file)
--- 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 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