From a6abaa9ba95068c5386e1a4866e3bae0fc29c490 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 30 Jan 2020 19:30:34 +0100 Subject: [PATCH 1/2] ARROW-7712: [CI] [Crossbow] Delete fuzzit jobs We will focus on OSS-Fuzz, now that we have been accepted there. --- README.md | 2 +- dev/tasks/tasks.yml | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/README.md b/README.md index f7dbb5852c1..e6b5718a8c6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ [![Build Status](https://ci.appveyor.com/api/projects/status/github/apache/arrow/branch/master?svg=true)](https://ci.appveyor.com/project/ApacheSoftwareFoundation/arrow/branch/master) [![Coverage Status](https://codecov.io/gh/apache/arrow/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/arrow?branch=master) -[![Fuzzit Status](https://app.fuzzit.dev/badge?org_id=yMxZh42xl9qy6bvg3EiJ&branch=master)](https://app.fuzzit.dev/admin/yMxZh42xl9qy6bvg3EiJ/dashboard) +[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arrow.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arrow) [![License](http://img.shields.io/:license-Apache%202-blue.svg)](https://github.com/apache/arrow/blob/master/LICENSE.txt) [![Twitter Follow](https://img.shields.io/twitter/follow/apachearrow.svg?style=social&label=Follow)](https://twitter.com/apachearrow) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 7142491fea6..38023f7f6a4 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -122,8 +122,6 @@ groups: - test-ubuntu-18.04-r-sanitizer - test-debian-10-go-1.12 - test-ubuntu-18.04-docs - - test-ubuntu-fuzzit-fuzzing - - test-ubuntu-fuzzit-regression - test-conda-python-2.7-pandas-latest - test-conda-python-2.7-pandas-master - test-conda-python-3.7-pandas-latest @@ -300,9 +298,6 @@ groups: - test-ubuntu-18.04-r-sanitizer - test-debian-10-go-1.12 - test-ubuntu-18.04-docs - # https://issues.apache.org/jira/browse/ARROW-7712 - # - test-ubuntu-fuzzit-fuzzing - # - test-ubuntu-fuzzit-regression - test-conda-python-2.7-pandas-latest - test-conda-python-3.7-pandas-latest - test-conda-python-3.7-pandas-master @@ -2058,30 +2053,6 @@ tasks: - docker-compose build ubuntu-docs - docker-compose run ubuntu-docs - test-ubuntu-fuzzit-fuzzing: - ci: circle - platform: linux - template: docker-tests/circle.linux.yml - params: - commands: - - docker-compose pull --ignore-pull-failures ubuntu-cpp - - docker-compose pull --ignore-pull-failures ubuntu-fuzzit - - docker-compose build ubuntu-cpp - - docker-compose build ubuntu-fuzzit - - docker-compose run -e FUZZIT_JOB_TYPE=fuzzing ubuntu-fuzzit - - test-ubuntu-fuzzit-regression: - ci: circle - platform: linux - template: docker-tests/circle.linux.yml - params: - commands: - - docker-compose pull --ignore-pull-failures ubuntu-cpp - - docker-compose pull --ignore-pull-failures ubuntu-fuzzit - - docker-compose build ubuntu-cpp - - docker-compose build ubuntu-fuzzit - - docker-compose run -e FUZZIT_JOB_TYPE=regression ubuntu-fuzzit - ############################## Integration tests ############################ test-conda-python-2.7-pandas-latest: From 6c6d2c462f05b9e171f7e05606e1bf7d971a9cb3 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 30 Jan 2020 21:19:55 +0100 Subject: [PATCH 2/2] Remove remaining fuzzit-related configuration --- ci/docker/linux-apt-fuzzit.dockerfile | 47 --------------------------- ci/scripts/fuzzit_build.sh | 46 -------------------------- docker-compose.yml | 24 -------------- 3 files changed, 117 deletions(-) delete mode 100644 ci/docker/linux-apt-fuzzit.dockerfile delete mode 100755 ci/scripts/fuzzit_build.sh diff --git a/ci/docker/linux-apt-fuzzit.dockerfile b/ci/docker/linux-apt-fuzzit.dockerfile deleted file mode 100644 index 5cb14020ae4..00000000000 --- a/ci/docker/linux-apt-fuzzit.dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -ARG base -FROM ${base} - -RUN apt-get update && \ - apt-get install -y -q \ - clang-7 \ - libclang-7-dev \ - clang-format-7 \ - clang-tidy-7 \ - clang-tools-7 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN wget -O /usr/local/bin/fuzzit https://github.com/fuzzitdev/fuzzit/releases/latest/download/fuzzit_Linux_x86_64 && \ - chmod a+x /usr/local/bin/fuzzit - -ENV ARROW_FUZZING="ON" \ - ARROW_USE_ASAN="ON" \ - CC="clang-7" \ - CXX="clang++-7" \ - ARROW_BUILD_TYPE="RelWithDebInfo" \ - ARROW_FLIGHT="OFF" \ - ARROW_GANDIVA="OFF" \ - ARROW_ORC="OFF" \ - ARROW_PARQUET="OFF" \ - ARROW_PLASMA="OFF" \ - ARROW_WITH_BZ2="OFF" \ - ARROW_WITH_ZSTD="OFF" \ - ARROW_BUILD_BENCHMARKS="OFF" \ - ARROW_BUILD_UTILITIES="OFF" diff --git a/ci/scripts/fuzzit_build.sh b/ci/scripts/fuzzit_build.sh deleted file mode 100755 index b73c49cddb4..00000000000 --- a/ci/scripts/fuzzit_build.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -euxo pipefail - -export TARGET_ID=apache-arrow/arrow-ipc-fuzzing - -source_dir=${1}/cpp -build_dir=${2}/cpp - -pushd ${build_dir}/relwithdebinfo - -mkdir -p out - -cp arrow-ipc-fuzzing-test out/fuzzer -ldd arrow-ipc-fuzzing-test | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' out/ - -pushd out -tar -czvf fuzzer.tar.gz * -stat fuzzer.tar.gz -popd - -fuzzit create job \ - --type $FUZZIT_JOB_TYPE \ - --host $FUZZIT_HOST \ - --revision $CI_ARROW_SHA \ - --branch $CI_ARROW_BRANCH \ - $TARGET_ID \ - out/fuzzer.tar.gz - -popd diff --git a/docker-compose.yml b/docker-compose.yml index 4eb92bfa14c..108a039adca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -951,30 +951,6 @@ services: command: > /bin/bash -c "pip install -e /arrow/dev/archery && archery lint" - ubuntu-fuzzit: - # Usage: - # docker-compose build ubuntu-cpp - # docker-compose build ubuntu-fuzzit - # docker-compose run ubuntu-fuzzit - build: - context: . - dockerfile: ci/docker/linux-apt-fuzzit.dockerfile - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-fuzzit - args: - base: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp - environment: - <<: *ccache - FUZZIT_API_KEY: c0b760d37db6012fcaafd8ca5f412ba7bcd297ac969650502994b51aa11798153824442f999a067e1ef67821989ed664 - FUZZIT_HOST: bionic-llvm7 - CI_ARROW_SHA: ${CI_ARROW_SHA:-UNSET} - CI_ARROW_BRANCH: ${CI_ARROW_BRANCH:-UNSET} - volumes: *debian-volumes - command: > - /bin/bash -c " - /arrow/ci/scripts/cpp_build.sh /arrow /build && - /arrow/ci/scripts/fuzzit_build.sh /arrow /build" - ######################### Integration Tests ################################# postgres: