From 216ec0b8a40da0639232294721066665a509350a Mon Sep 17 00:00:00 2001
From: DavidKorczynski <david@adalogics.com>
Date: Mon, 21 Nov 2022 15:21:59 +0000
Subject: [PATCH] infra: base-builder: refine fuzz-introspector building
 (#9004)

- Pass coverage_url to both c/c++ and python report generation.
- Remove a double calling of introspector report generation.

Signed-off-by: David Korczynski <david@adalogics.com>

Signed-off-by: David Korczynski <david@adalogics.com>
---
 infra/base-images/base-builder/compile        | 22 +++++++++----------
 .../base-builder/compile_python_fuzzer        |  3 ++-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile
index 770703e47..271cce43a 100755
--- a/infra/base-images/base-builder/compile
+++ b/infra/base-images/base-builder/compile
@@ -226,11 +226,19 @@ if [ "$SANITIZER" = "introspector" ]; then
 
   cd $SRC/inspector
 
+  # Make fuzz-introspector HTML report.
+
+  REPORT_ARGS=""
+  # Only pass coverage_url when COVERAGE_URL is set (in cloud builds)
+  if [[ ! -z "${COVERAGE_URL+x}" ]]; then
+    REPORT_ARGS="$REPORT_ARGS --coverage_url=${COVERAGE_URL}"
+  fi
+
   # Do different things depending on languages
   if [ "$FUZZING_LANGUAGE" = "python" ]; then
     echo "GOING python route"
     set -x
-    REPORT_ARGS="--target_dir=$SRC/inspector"
+    REPORT_ARGS="$REPORT_ARGS --target_dir=$SRC/inspector"
     REPORT_ARGS="$REPORT_ARGS --language=python"
     python3 /fuzz-introspector/src/main.py report $REPORT_ARGS
     cp -rf $SRC/inspector $OUT/inspector
@@ -242,11 +250,7 @@ if [ "$SANITIZER" = "introspector" ]; then
 
     # Generate fuzz-introspector HTML report, this generates
     # the file exe_to_fuzz_introspector_logs.yaml
-    REPORT_ARGS="--target_dir=$SRC/inspector"
-    # Only pass coverage_url when COVERAGE_URL is set (in cloud builds)
-    if [[ ! -z "${COVERAGE_URL+x}" ]]; then
-      REPORT_ARGS="$REPORT_ARGS --coverage_url=${COVERAGE_URL}"
-    fi
+    REPORT_ARGS="$REPORT_ARGS --target_dir=$SRC/inspector"
     # Use the just-generated correlation file
     REPORT_ARGS="$REPORT_ARGS --correlation_file=exe_to_fuzz_introspector_logs.yaml"
     REPORT_ARGS="$REPORT_ARGS --name=$PROJECT_NAME"
@@ -254,10 +258,4 @@ if [ "$SANITIZER" = "introspector" ]; then
 
     cp -rf $SRC/inspector $OUT/inspector
   fi
-  # Use the just-generated correlation file
-  REPORT_ARGS="$REPORT_ARGS --correlation_file=exe_to_fuzz_introspector_logs.yaml"
-  REPORT_ARGS="$REPORT_ARGS --name=$PROJECT_NAME"
-  python3 /fuzz-introspector/src/main.py report $REPORT_ARGS
-
-  cp -rf $SRC/inspector $OUT/inspector
 fi
diff --git a/infra/base-images/base-builder/compile_python_fuzzer b/infra/base-images/base-builder/compile_python_fuzzer
index 537c3e717..e2527dc66 100755
--- a/infra/base-images/base-builder/compile_python_fuzzer
+++ b/infra/base-images/base-builder/compile_python_fuzzer
@@ -33,7 +33,8 @@ if [[ $SANITIZER = *introspector* ]]; then
     # We must ensure python3.9, this is because we use certain
     # AST logic from there.
     # The below should probably be refined
-    apt install -y python3.9
+    apt-get install -y python3.9
+    apt-get update
     apt-get install -y python3-pip
     python3.9 -m pip install virtualenv
     python3.9 -m virtualenv .venv