Update CI roles

tests/roles/custom-test-fonts/files/run-family-test

@@ -83,13 +83,13 @@ debug "Family: $OPT_FAMILY"
 debug "Lang: $OPT_LANG"
 debug "Artifacts dir: $OPT_ARTIFACTS_DIR"
 debug "Package name: $OPT_PACKAGE"
-STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}" | sed -e 's/\//-/g' -e 's/ /-/g')
+STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}_${OPT_LANG}" | sed -e 's/\//-/g' -e 's/ /-/g')
 debug "Log file: $STR_TEST_DASHED.log"
 
 clean_exit() {
 	rc=$?;
 	trap - SIGINT SIGTERM SIGABRT EXIT
-	echo "Run test $OPT_ALIAS: done."
+	echo "Run test $OPT_ALIAS: done. Test's exit code: $rc"
 	for pid in $(ps -o pid --no-headers --ppid $$); do
 		if [ -n "$(ps -p $pid -o pid=)" ]; then
 			kill -s HUP $pid
@@ -114,11 +114,16 @@ clean_exit() {
 		status="ERROR"
 	fi
 	echo "$status $OPT_ALIAS" >> "$OPT_ARTIFACTS_DIR/test.log"
-	mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}"
+	mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}"
 	local results="$OPT_ARTIFACTS_DIR/results.yml"
 	local result=$(echo $status | tr '[:upper:]' '[:lower:]')
 	test -f "$results" || echo 'results:' > "$results"
-	echo "- {result: $result, test: $OPT_ALIAS}" >> "$results"
+	printf '%s\n' '' \
+	       "- test: $OPT_ALIAS" \
+	       "  result: $result" \
+	       "  logs:" \
+	       "  - ${status}_${log_file_name}" \
+	       >> "$results"
 	exit 0
 }
 trap clean_exit SIGINT SIGTERM SIGABRT EXIT
@@ -139,15 +144,19 @@ debug "Config: `cat $tmpconfd/fonts.conf`"
 
 mkdir -p "$OPT_ARTIFACTS_DIR"
 export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log"
-logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
+logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
-logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log"
+logfile="$(realpath "$logfile")"
-exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4)
+exec > >(tee -a "$logfile") 2>&1
 
 debug "Check family assignment"
 res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-match -f "%{family[0]}" :family=$OPT_ALIAS:lang=$OPT_LANG`
+ret=0
 if [ "x$res" = "x$OPT_FAMILY" ]; then
 	echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected"
 else
-	echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)"
+    echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)"
+    ret=1
 fi
 rm -rf $tmpconfd
+
+exit $ret

tests/roles/custom-test-fonts/files/run-lang-coverage-test

@@ -89,7 +89,7 @@ STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g')
 clean_exit() {
     rc=$?;
     trap - SIGINT SIGTERM SIGABRT EXIT
-    echo "Run test $OPT_LANG: done."
+    echo "Run test $OPT_LANG: done. Test's exit code: $rc"
     for pid in $(ps -o pid --no-headers --ppid $$); do
 	if [ -n "$(ps -p $pid -o pid=)" ]; then
 	    kill -s HUP $pid
@@ -116,20 +116,25 @@ clean_exit() {
 	status="ERROR"
     fi
     echo "$status $OPT_LANG" >> "$OPT_ARTIFACTS_DIR/test.log"
-    mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}"
+    mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}"
     local results="$OPT_ARTIFACTS_DIR/results.yml"
     local result=$(echo $status | tr '[:upper:]' '[:lower:]')
     test -f "$results" || echo 'results:' > "$results"
-    echo "- {result: $result, test: $OPT_LANG}" >> "$results"
+    printf '%s\n' '' \
+	   "- test: $OPT_LANG" \
+	   "  result: $result" \
+	   "  logs:" \
+	   "  - ${status}_${log_file_name}" \
+	   >> "$results"
     exit 0
 }
 trap clean_exit SIGINT SIGTERM SIGABRT EXIT
 
 mkdir -p "$OPT_ARTIFACTS_DIR"
 export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log"
-logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
+logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
-logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log"
+logfile="$(realpath "$logfile")"
-exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4)
+exec > >(tee -a "$logfile") 2>&1
 
 expand_regex() {
     local p ret=()
@@ -186,6 +191,7 @@ contains() {
 }
 
 debug "Check language coverage"
+ret=0
 set +f
 for p in ${OPT_PATH[@]}; do
     for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do
@@ -213,12 +219,15 @@ for p in ${OPT_PATH[@]}; do
 		NOT_MATCHED=("${NOT_MATCHED[@]/$n}")
 	    fi
 	    debug "  $i"
-	    res=`fc-validate -l $OPT_LANG $i`
+	    res=`fc-validate -l $OPT_LANG $i || :`
 	    if echo $res | grep -q Missing; then
 		echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage."
+		ret=1
 	    else
 		echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage."
 	    fi
 	fi
     done
 done
+
+exit $ret

tests/roles/custom-test-fonts/tasks/main.yml

@@ -2,15 +2,23 @@
 
 - block:
   - name: language coverage
+    environment:
+      LANG: "en_US.UTF-8"
     script: run-lang-coverage-test --lang "{{ item }}" {% if coverage.values is not defined or coverage[item].path_prefix is not defined %} --path {{ path_prefix }} {% else %} {{ '--path "' + (coverage[item].path_prefix | join('" --path "')) + '"' }} {% endif %} --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}}
     with_items:
     - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}"
   - name: generic family assignment
+    environment:
+      LANG: "en_US.UTF-8"
     when: families is defined
     script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }}
     with_items:
     - "{{ families }}"
 
+  - name: Collect all of failures into one file
+    shell: |
+      grep -v PASS "{{ remote_artifacts }}"/FAIL_*.log > "{{ remote_artifacts }}"/FAIL-all.log || :
+
   - name: Check the results
     shell: |
       log="{{ remote_artifacts }}/test.log"
@@ -38,3 +46,7 @@
 
   - include_role:
       name: str-common-final
+
+  - name: Validate the result
+    shell: echo "test_results.stdout"
+    failed_when: test_results.stdout != 'PASS'