From 4c712a1b25bf0a846a8a307fe252dfd6201260ef Mon Sep 17 00:00:00 2001
From: Max Dymond <cmeister2@gmail.com>
Date: Thu, 1 Dec 2022 13:54:13 +0000
Subject: [PATCH] ci: Remove zuul fuzzing job as it's superseded by CIFuzz

---
 scripts/zuul/script.sh        | 12 ------------
 tests/fuzz/README.md          | 14 --------------
 tests/fuzz/download_fuzzer.sh | 30 ------------------------------
 zuul.d/jobs.yaml              | 18 +-----------------
 4 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 tests/fuzz/README.md
 delete mode 100755 tests/fuzz/download_fuzzer.sh

diff --git a/scripts/zuul/script.sh b/scripts/zuul/script.sh
index ebfd0b0658..38faf16d61 100755
--- a/scripts/zuul/script.sh
+++ b/scripts/zuul/script.sh
@@ -91,15 +91,3 @@ if [ "$T" = "cmake" ]; then
   cmake --build build
   env TFLAGS="!1139 $TFLAGS" cmake --build build --target test-nonflaky
 fi
-
-if [ "$T" = "fuzzer" ]; then
-  # Download the fuzzer to a temporary folder
-  ./tests/fuzz/download_fuzzer.sh /tmp/curl_fuzzer
-
-  export CURLSRC=$PWD
-
-  # Run the mainline fuzzer test
-  pushd /tmp/curl_fuzzer
-  ./mainline.sh ${CURLSRC}
-  popd
-fi
diff --git a/tests/fuzz/README.md b/tests/fuzz/README.md
deleted file mode 100644
index 8bca857e7f..0000000000
--- a/tests/fuzz/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-Copyright (C) 1998 - 2022 Daniel Stenberg, <daniel@haxx.se>, et al.
-
-SPDX-License-Identifier: curl
--->
-
-Fuzz tests
-==========
-
-The fuzzing tests for curl have been moved to [a separate
-repository](https://github.com/curl/curl-fuzzer).
-
-More information on how to get started with curl fuzz testing can be found
-there.
diff --git a/tests/fuzz/download_fuzzer.sh b/tests/fuzz/download_fuzzer.sh
deleted file mode 100755
index e9d6be4240..0000000000
--- a/tests/fuzz/download_fuzzer.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-# SPDX-License-Identifier: curl
-#
-###########################################################################
-
-# If any commands fail, fail the script immediately.
-set -ex
-
-# Clone the curl-fuzzer repository to the specified directory.
-git clone --depth=1 https://github.com/curl/curl-fuzzer "$1"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 785887a0b6..7ff17709c8 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -22,7 +22,7 @@
 #
 ###########################################################################
 
-# The results of each of these jobs can be found at 
+# The results of each of these jobs can be found at
 # https://curl.zuul.vexxhost.dev/builds. As of November 2021 they are not being
 # propagated to the GitHub "checks" UI, you need to check for them manually.
 
@@ -186,21 +186,6 @@
           -DCURL_ZSTD=1
         PKG_CONFIG_PATH: "{{ ansible_user_dir }}/ngbuild/lib/pkgconfig"
 
-- job:
-    name: curl-fuzzer
-    parent: curl-base
-    vars:
-      curl_apt_packages:
-        - clang
-        - clang-9
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-      curl_env:
-        CC: clang-9
-        CXX: clang++-9
-        T: fuzzer
-
 - job:
     name: curl-debug-clang-with-openssl-dl-ubsan
     parent: curl-base
@@ -239,6 +224,5 @@
       - curl-debug-clang-with-gnutls
       - curl-cmake-boringssl-quiche
       - curl-cmake-ngtcp2
-      - curl-fuzzer
       - curl-debug-clang-with-openssl-dl-ubsan
 ...