fixes

infra/base-images/base-builder/compile

@@ -280,12 +280,6 @@ else
   fi
 fi
 
-if [[ ! -z "${STORE_CCACHE-}" ]]; then
-  # Cleanup existing cache.
-  rm -rf $WORK/ccache
-  cp -rf /ccache/cache $WORK/ccache
-fi
-
 if [ "$SANITIZER" = "introspector" ]; then
   unset CXXFLAGS
   unset CFLAGS

infra/experimental/chronos/build_all.sh

@@ -22,9 +22,6 @@ projs=$(echo $c_project_yaml | xargs dirname | xargs basename -a | sort)
 cd infra/experimental/chronos
 
 for proj in $projs; do
-    fuzz_target=$(curl -s "https://introspector.oss-fuzz.com/api/harness-source-and-executable?project=$proj" | jq --raw-output '.pairs[0].executable')
-    if [ "$fuzz_target" != null ]; then
-        echo ./build_on_cloudbuild.sh $proj $fuzz_target c
-        ./build_on_cloudbuild.sh $proj $fuzz_target c
-    fi
+  echo ./build_on_cloudbuild.sh $proj c
+  ./build_on_cloudbuild.sh $proj c
 done

infra/experimental/chronos/build_on_cloudbuild.sh

@@ -15,13 +15,12 @@
 #
 ################################################################################
 PROJECT=$1
-FUZZ_TARGET=$2
-FUZZING_LANGUAGE=$3
+FUZZING_LANGUAGE=$2
 
 gcloud builds submit "https://github.com/google/oss-fuzz" \
   --async \
-  --git-source-revision=master \
+  --git-source-revision=add-replay-capture-1 \
   --config=cloudbuild.yaml \
-  --substitutions=_PROJECT=$PROJECT,_FUZZ_TARGET=$FUZZ_TARGET,_FUZZING_LANGUAGE=$FUZZING_LANGUAGE \
+  --substitutions=_PROJECT=$PROJECT,_FUZZING_LANGUAGE=$FUZZING_LANGUAGE \
   --project=oss-fuzz \
   --region=us-central1

infra/experimental/chronos/cloudbuild.yaml

@@ -32,17 +32,22 @@ steps:
   - gcr.io/oss-fuzz/${_PROJECT}
   - .
   dir: projects/${_PROJECT}
+- name: ubuntu
+  args:
+    - mkdir
+    - /workspace/ccache
 - name: 'gcr.io/cloud-builders/docker'
   args:
   - run
   - --entrypoint=/bin/sh
   - --env=SANITIZER=address
-  - --env=STORE_CCACHE=1
-  - --env=COMPILE_USING_CCACHE=1
+  - --env=CCACHE_DIR=/workspace/ccache
+  - --env=FUZZING_LANGUAGE=${_FUZZING_LANGUAGE}
   - --name=${_PROJECT}-origin-asan
+  - --volume=/workspace/ccache:/workspace/ccache
   - gcr.io/oss-fuzz/${_PROJECT}
   - -c
-  - "compile && rm -rf /out/*"
+  - "export PATH=/ccache/bin:$$PATH && compile && rm -rf /out/*"
 - name: ubuntu
   args:
     - cp
@@ -52,7 +57,7 @@ steps:
 # Prepare for ccache environment
 - name: ubuntu
   args:
-  - infra/experimental/chronos/prepare-ccache
+  - /workspace/infra/experimental/chronos/prepare-ccache
   - ${_PROJECT}
 # Build the ccached instance
 - name: 'gcr.io/cloud-builders/docker'
@@ -67,19 +72,21 @@ steps:
   args:
     - rm
     - -rf
-    - projects/${_PROJECT}/ccache
+    - projects/${_PROJECT}/ccache-cache
+    - /workspace/ccache
 # Build coverage image
 - name: 'gcr.io/cloud-builders/docker'
   args:
   - run
   - --entrypoint=/bin/sh
   - --env=SANITIZER=coverage
-  - --env=STORE_CCACHE=1
-  - --env=COMPILE_USING_CCACHE=1
+  - --env=CCACHE_DIR=/workspace/ccache
+  - --env=FUZZING_LANGUAGE=${_FUZZING_LANGUAGE}
   - --name=${_PROJECT}-origin-cov
+  - --volume=/workspace/ccache:/workspace/ccache
   - gcr.io/oss-fuzz/${_PROJECT}
   - -c
-  - "compile && rm -rf /out/*"
+  - "export PATH=/ccache/bin:$$PATH && compile && rm -rf /out/*"
 - name: ubuntu
   args:
     - cp
@@ -89,7 +96,7 @@ steps:
 # Prepare for ccache environment
 - name: ubuntu
   args:
-  - infra/experimental/chronos/prepare-ccache
+  - /workspace/infra/experimental/chronos/prepare-ccache
   - ${_PROJECT}
 # Build the ccached instance
 - name: 'gcr.io/cloud-builders/docker'