Merge branch 'master' into jira_add_watcher_qyeo

Author: qyeo-sc

docker/README.md

@@ -75,8 +75,6 @@ graph TD
 
     subgraph OSS-Fuzz
         H(oss-fuzz/base)
-        N(oss-fuzz/worker)
-        O(oss-fuzz/host)
         P(oss-fuzz/host-high-end)
     end
 
@@ -103,8 +101,5 @@ graph TD
     F --> L;
     F --> M;
 
-    H --> N;
-    H --> O;
-
-    O --> P;
+    H --> P;
 ```

docker/build-immutable.sh

@@ -23,7 +23,6 @@ IMAGES=(
   gcr.io/clusterfuzz-images/base/immutable
   gcr.io/clusterfuzz-images/chromium/base/immutable
   gcr.io/clusterfuzz-images/chromium/builder/immutable
-  gcr.io/clusterfuzz-images/chromium/tester/immutable
   gcr.io/clusterfuzz-images/tworker/immutable
   gcr.io/clusterfuzz-images/utask-main-scheduler/immutable
   gcr.io/clusterfuzz-images/fuchsia/immutable

docker/build.sh

@@ -19,12 +19,9 @@ IMAGES=(
   gcr.io/clusterfuzz-images/chromium/base
   gcr.io/clusterfuzz-images/chromium/builder
   gcr.io/clusterfuzz-images/chromium/high-end
-  gcr.io/clusterfuzz-images/chromium/tester
   gcr.io/clusterfuzz-images/chromium/tests-syncer
   gcr.io/clusterfuzz-images/oss-fuzz/base
-  gcr.io/clusterfuzz-images/oss-fuzz/host
   gcr.io/clusterfuzz-images/oss-fuzz/host-high-end
-  gcr.io/clusterfuzz-images/oss-fuzz/worker
   gcr.io/clusterfuzz-images/ci
   gcr.io/clusterfuzz-images/utask-main-scheduler
   gcr.io/clusterfuzz-images/tworker