fix(build): update build check commands to use python3 and improve error messages

Author: hunsche

infra/build/functions/test_data/expected_build_steps.json

@@ -148,7 +148,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine afl --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine afl --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine afl --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine afl --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine afl --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-afl-address-x86_64"
   },
@@ -289,7 +289,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine centipede --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine centipede --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine centipede --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine centipede --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine centipede --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-centipede-address-x86_64"
   },
@@ -430,7 +430,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer none --engine centipede --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer none --engine centipede --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer none --engine centipede --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer none --engine centipede --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer none --engine centipede --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-centipede-none-x86_64"
   },
@@ -571,7 +571,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine honggfuzz --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine honggfuzz --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine honggfuzz --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine honggfuzz --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine honggfuzz --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-honggfuzz-address-x86_64"
   },
@@ -712,7 +712,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-libfuzzer-address-x86_64"
   },
@@ -853,7 +853,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture i386 test-project\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture i386 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture i386 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture i386 test-project\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture i386 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-libfuzzer-address-i386"
   },
@@ -994,7 +994,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture aarch64 test-project\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture aarch64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture aarch64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture aarch64 test-project\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture aarch64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-libfuzzer-address-aarch64"
   },
@@ -1135,7 +1135,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer memory --engine libfuzzer --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer memory --engine libfuzzer --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer memory --engine libfuzzer --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer memory --engine libfuzzer --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer memory --engine libfuzzer --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-libfuzzer-memory-x86_64"
   },
@@ -1276,7 +1276,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer undefined --engine libfuzzer --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer undefined --engine libfuzzer --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer undefined --engine libfuzzer --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer undefined --engine libfuzzer --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer undefined --engine libfuzzer --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-libfuzzer-undefined-x86_64"
   },

infra/build/functions/test_data/expected_centipede_build_steps.json

@@ -105,7 +105,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine centipede --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine centipede --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine centipede --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer address --engine centipede --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer address --engine centipede --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-centipede-address-x86_64"
   },
@@ -246,7 +246,7 @@
       "gcr.io/oss-fuzz-base/base-runner",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer none --engine centipede --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer none --engine centipede --architecture x86_64 test-project\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer none --engine centipede --architecture x86_64 test-project || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image test-project\\npython infra/helper.py build_fuzzers --sanitizer none --engine centipede --architecture x86_64 test-project\\npython infra/helper.py check_build --sanitizer none --engine centipede --architecture x86_64 test-project\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-centipede-none-x86_64"
   },

infra/build/functions/test_data/expected_trial_build_steps.json

@@ -251,7 +251,7 @@
       "gcr.io/oss-fuzz-base/base-runner-testing-legacy-mybranch",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image skcms\\npython infra/helper.py build_fuzzers --sanitizer address --engine afl --architecture x86_64 skcms\\npython infra/helper.py check_build --sanitizer address --engine afl --architecture x86_64 skcms\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine afl --architecture x86_64 --base-image-tag legacy skcms || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image skcms\\npython infra/helper.py build_fuzzers --sanitizer address --engine afl --architecture x86_64 skcms\\npython infra/helper.py check_build --sanitizer address --engine afl --architecture x86_64 skcms\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-afl-address-x86_64"
   },
@@ -343,7 +343,7 @@
       "gcr.io/oss-fuzz-base/base-runner-testing-legacy-mybranch",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image skcms\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture x86_64 skcms\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture x86_64 skcms\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture x86_64 --base-image-tag legacy skcms || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image skcms\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture x86_64 skcms\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture x86_64 skcms\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-libfuzzer-address-x86_64"
   },
@@ -435,7 +435,7 @@
       "gcr.io/oss-fuzz-base/base-runner-testing-legacy-mybranch",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image skcms\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture i386 skcms\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture i386 skcms\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture i386 --base-image-tag legacy skcms || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image skcms\\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture i386 skcms\\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture i386 skcms\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-libfuzzer-address-i386"
   },
@@ -527,7 +527,7 @@
       "gcr.io/oss-fuzz-base/base-runner-testing-legacy-mybranch",
       "bash",
       "-c",
-      "test_all.py || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image skcms\\npython infra/helper.py build_fuzzers --sanitizer undefined --engine libfuzzer --architecture x86_64 skcms\\npython infra/helper.py check_build --sanitizer undefined --engine libfuzzer --architecture x86_64 skcms\\n********************************************************************************\" && false)"
+      "python3 infra/helper.py check_build --sanitizer undefined --engine libfuzzer --architecture x86_64 --base-image-tag legacy skcms || (echo \"********************************************************************************\\nBuild checks failed.\\nTo reproduce, run:\\npython infra/helper.py build_image skcms\\npython infra/helper.py build_fuzzers --sanitizer undefined --engine libfuzzer --architecture x86_64 skcms\\npython infra/helper.py check_build --sanitizer undefined --engine libfuzzer --architecture x86_64 skcms\\n********************************************************************************\" && false)"
     ],
     "id": "build-check-libfuzzer-undefined-x86_64"
   },

infra/build/functions/trial_build.py

@@ -433,7 +433,7 @@ def _do_build_type_builds(args, config, credentials, build_type, projects):
           credentials,
           build_type.type_name,
           extra_tags=tags,
-          timeout=PROJECT_BUILD_TIMEOUT))
+          timeout=PROJECT_BUILD_TIMEOUT))['id']
       time.sleep(1)  # Avoid going over 75 requests per second limit.
     except Exception as error:  # pylint: disable=broad-except
       # Handle flake.