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 1535b42bff358f1a65d7d0a281a7fedd6b262eab..d3c07be7438e63b96923b3b0c80c533f5553f0ea 100644 (file)
--- 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 e5619696ba6a04f841f35adae8021ebb6c2acebe..00019486fa56a6b38b6d6e2c22605846be75d777 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 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