GitLab CI+tools: Fuzz test updates.

Make sure we install the llvm package, which includes llvm-symbolizer.
Add the current branch and CI job information to the error report.

.gitlab-ci.yml

@@ -812,6 +812,8 @@ Code Lines:
     MIN_PLUGINS: 10
     MAX_PASSES: 15
   before_script:
+    - DEBIAN_FRONTEND=noninteractive apt-get update
+    - DEBIAN_FRONTEND=noninteractive apt-get --yes install llvm-$CLANG_VERSION
     - mkdir -p ccache
     # Signal after_script, which runs in its own shell.
     - echo "export FUZZ_PASSED=true" > /tmp/fuzz_result.sh

tools/test-common.sh

@@ -131,14 +131,14 @@ function ws_exit_error() {
     echo
 
     # Fill in build information
+    echo -e "Branch: $(git rev-parse --abbrev-ref HEAD)\n" > $TMP_DIR/${ERR_FILE}.header
     echo -e "Input file: $CF\n" > $TMP_DIR/${ERR_FILE}.header
     echo -e "Build host information:" >> $TMP_DIR/${ERR_FILE}.header
     uname -a >> $TMP_DIR/${ERR_FILE}.header
     lsb_release -a >> $TMP_DIR/${ERR_FILE}.header 2> /dev/null
 
-    if [ -n "$BUILDBOT_BUILDERNAME" ] ; then
-        echo -e "\nBuildbot information:" >> $TMP_DIR/${ERR_FILE}.header
-        env | grep "^BUILDBOT_" >> $TMP_DIR/${ERR_FILE}.header
+    if [ -n "$CI_JOB_NAME" ] ; then
+        echo -e "\nCI job $CI_JOB_NAME, ID $CI_JOB_ID: " >> $TMP_DIR/${ERR_FILE}.header
     fi
 
     echo -e "\nReturn value: " $RETVAL >> $TMP_DIR/${ERR_FILE}.header