Print the reproducer and commands

Author: vjovanov

.github/workflows/check-new-library-versions-in-batch.yml

@@ -95,7 +95,7 @@ jobs:
           readarray -t VERSIONS < <(echo '${{ toJson(matrix.item.versions) }}' | jq -r '.[]')
           FIRST_TESTING_VERSION="${VERSIONS[0]}"
           
-          TITLE_SEARCH="${{ env.ISSUE_TITLE_MIDDLE }}$GROUP_ID:$ARTIFACT_ID:$FIRST_TESTING_VERSION failed in"
+          TITLE_SEARCH="${{ env.ISSUE_TITLE_MIDDLE }}$GROUP_ID:$ARTIFACT_ID:$FIRST_TESTING_VERSION"
           
           ISSUE_NUMBER=$(gh issue list --repo "${{ github.repository }}" --state open --search "in:title $TITLE_SEARCH" --json number,title --jq \
             '.[] | select(.title | endswith("'"$TITLE_SEARCH"'")) | .number')
@@ -141,7 +141,7 @@ jobs:
           echo "EOF" >> $GITHUB_OUTPUT
 
           # Extract failure type and failed version
-          awk -F'[][]|:' '/^FAILED/ {print "failure_type="$2; print "failed_version="$4}' test_results.txt >> $GITHUB_OUTPUT
+          awk -F'[][]' '/^FAILED/ {print "failure_type="$2; print "failed_version="$4; print "failed_command="$6}' test_results.txt >> $GITHUB_OUTPUT
           
           # Fetch the job URL
           JOB_ID=$(
@@ -224,6 +224,7 @@ jobs:
           # Use single-quoted here-doc to disable any shell expansion of log content
           cat > "$BODY_FILE" <<'EOF'
           Failure kind: ${{ steps.runtests.outputs.failure_type }}
+          Reproducer: `${{ steps.runtests.outputs.failed_command }}`
           Runner log: ${{ steps.runtests.outputs.runner_log_url }}
           Last ${{ env.LOG_LINES }} lines of the log:
           ```console

.github/workflows/run-consecutive-tests.sh

@@ -6,7 +6,6 @@
 # work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 set -u
-set -x
 
 if [ $# -ne 2 ]; then
   echo "Usage: $0 <test-coordinates> <versions-json-array>"
@@ -23,43 +22,59 @@ VERSIONS_JSON="${VERSIONS_JSON%"${VERSIONS_JSON##*[!\']}"}"
 
 # Parse versions with jq
 readarray -t VERSIONS < <(echo "$VERSIONS_JSON" | jq -r '.[]')
+export DELIMITER="========================================================================================"
 
-for VERSION in "${VERSIONS[@]}"; do
-  # check if javac works for the new version
-  GVM_TCK_LV="$VERSION" ./gradlew clean javac -Pcoordinates="$TEST_COORDINATES"
-  RESULT=$?
-  if [ "$RESULT" -ne 0 ]; then
-    echo "FAILED [javac compile]:$VERSION"
-    break
-  fi
+run_multiple_attempts() {
+  local stage="$1"
+  local max_attempts="$2"
+  local gradle_command="$3"
+
+  echo "$DELIMITER"
+  echo " $TEST_COORDINATES:$VERSION stage $stage"
+  echo "$DELIMITER"
+
+  local attempt=0
+  local result=0
 
-  # check if native-image can be built
-  GVM_TCK_LV="$VERSION" ./gradlew clean nativeTestCompile -Pcoordinates="$TEST_COORDINATES"
-  RESULT=$?
-    if [ "$RESULT" -ne 0 ]; then
-      echo "FAILED [native-image build]:$VERSION"
-      break
+  while [ $attempt -lt "$max_attempts" ]; do
+    local cmd_str="GVM_TCK_LV=\"$VERSION\" ./gradlew clean $gradle_command -Pcoordinates=\"$TEST_COORDINATES\""
+    if [ $attempt -gt 0 ]; then
+      echo "Re-running stage '$stage' (attempt $((attempt + 1))/$max_attempts)"
     fi
 
-  echo "Running test with GVM_TCK_LV=$VERSION and coordinates=$TEST_COORDINATES"
-  GVM_TCK_LV="$VERSION" ./gradlew test -Pcoordinates="$TEST_COORDINATES"
-  RESULT=$?
-  ATTEMPTS=1
-
-  # maybe we failed because the test was flaky => try two more times to be sure
-  while [ "$RESULT" -ne 0 ] && [ $ATTEMPTS -le 2 ]; do
-    echo "Re-running the test with GVM_TCK_LV=$VERSION and coordinates=$TEST_COORDINATES"
-    GVM_TCK_LV="$VERSION" ./gradlew clean test -Pcoordinates="$TEST_COORDINATES"
-    RESULT=$?
-    ATTEMPTS=$((ATTEMPTS + 1))
+    eval "$cmd_str"
+    result=$?
+
+    if [ "$result" -eq 0 ]; then
+      return 0
+    fi
+
+    attempt=$((attempt + 1))
   done
 
-  if [ "$RESULT" -eq 0 ]; then
-    echo "PASSED:$VERSION"
-  else
-    echo "FAILED [native-image run]:$VERSION"
+  echo "FAILED [$stage][$VERSION][$cmd_str]"
+  return $result
+}
+
+for VERSION in "${VERSIONS[@]}"; do
+  echo "$DELIMITER"
+  echo " Testing $TEST_COORDINATES:$VERSION"
+  echo "$DELIMITER"
+
+
+  if ! run_multiple_attempts "javac compile" 1 javac; then
+    break
+  fi
+
+  if ! run_multiple_attempts "native-image build" 1 nativeTestCompile; then
     break
   fi
+
+  if ! run_multiple_attempts "native-image run" 3 test; then
+    break
+  fi
+
+  echo "PASSED:$VERSION"
 done
 
 exit 0