This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git

commit 075712428c19cc1d9d943456c20e54528ff31127
Author: Antoine Pitrou <anto...@python.org>
AuthorDate: Wed Oct 2 19:41:57 2019 +0200

    ARROW-6581: [C++] Fix fuzzit job submission
    
    Also make it faster (we don't need Gandiva here).
    
    Closes #5407 from pitrou/ARROW-6581-fix-fuzzit-job and squashes the 
following commits:
    
    2628a74f8 <Antoine Pitrou> ARROW-6581:  Fix fuzzit job submission
    
    Authored-by: Antoine Pitrou <anto...@python.org>
    Signed-off-by: Krisztián Szűcs <szucs.kriszt...@gmail.com>
---
 ci/docker_build_and_fuzzit.sh | 16 +++++++++-------
 docker-compose.yml            | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/ci/docker_build_and_fuzzit.sh b/ci/docker_build_and_fuzzit.sh
index 18bd0d4..b3bf1bd 100755
--- a/ci/docker_build_and_fuzzit.sh
+++ b/ci/docker_build_and_fuzzit.sh
@@ -24,13 +24,14 @@ export ARROW_USE_ASAN="ON"
 export CC="clang-7"
 export CXX="clang++-7"
 export ARROW_BUILD_TYPE="RelWithDebInfo"
+export ARROW_FLIGHT="OFF"
+export ARROW_GANDIVA="OFF"
 export ARROW_ORC="OFF"
 export ARROW_PARQUET="OFF"
 export ARROW_PLASMA="OFF"
-export ARROW_FLIGHT="OFF"
-export ARROW_BUILD_BENCHMARKS="OFF"
 export ARROW_WITH_BZ2="OFF"
 export ARROW_WITH_ZSTD="OFF"
+export ARROW_BUILD_BENCHMARKS="OFF"
 export ARROW_BUILD_UTILITIES="OFF"
 /arrow/ci/docker_build_cpp.sh || exit 1
 pushd /build/cpp
@@ -40,11 +41,12 @@ cp ./relwithdebinfo/arrow-ipc-fuzzing-test 
./relwithdebinfo/out/fuzzer
 ldd ./relwithdebinfo/arrow-ipc-fuzzing-test | grep "=> /" | awk '{print $3}' | 
xargs -I '{}' cp -v '{}' ./relwithdebinfo/out/.
 cd ./relwithdebinfo/out/
 tar -czvf fuzzer.tar.gz *
+stat fuzzer.tar.gz
 cd ../../
 
-export TARGET_ID=u79f6bXYgNH4NkU99iWK
-export 
FUZZIT_API_KEY=${FUZZIT_API_KEY:-ac6089a1bc2313679f2d99bb80553162c380676bff3f094de826b16229e28184a8084b86f52c95112bde6b3dbb07b9b7}
-wget -O fuzzit https://bin.fuzzit.dev/fuzzit-1.1
+export TARGET_ID=apache-arrow/arrow-ipc-fuzzing
+
+wget -O fuzzit 
https://github.com/fuzzitdev/fuzzit/releases/latest/download/fuzzit_Linux_x86_64
 chmod a+x fuzzit
-./fuzzit auth $FUZZIT_API_KEY
-./fuzzit create job --type fuzzing --host bionic-llvm7 --revision 
$CI_ARROW_SHA --branch $CI_ARROW_BRANCH $TARGET_ID 
./relwithdebinfo/out/fuzzer.tar.gz
+
+./fuzzit create job --type $FUZZIT_JOB_TYPE --host bionic-llvm7 --revision 
$CI_ARROW_SHA --branch $CI_ARROW_BRANCH $TARGET_ID 
./relwithdebinfo/out/fuzzer.tar.gz
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d0f6f9..6ebf616 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -447,6 +447,7 @@ services:
     volumes: *ubuntu-volumes
 
   fuzzit:
+    # Submit a fuzzing job on fuzzit.dev
     # Usage:
     #   docker-compose build cpp
     #   docker-compose build fuzzit
@@ -458,6 +459,41 @@ services:
     environment:
       CI_ARROW_SHA: ${CI_ARROW_SHA}
       CI_ARROW_BRANCH: ${CI_ARROW_BRANCH}
+      FUZZIT_JOB_TYPE: fuzzing
+      FUZZIT_API_KEY: 
c0b760d37db6012fcaafd8ca5f412ba7bcd297ac969650502994b51aa11798153824442f999a067e1ef67821989ed664
+    volumes: *ubuntu-volumes
+
+  fuzzit-regression:
+    # Submit a regression job on fuzzit.dev
+    # Usage:
+    #   docker-compose build cpp
+    #   docker-compose build fuzzit-regression
+    #   docker-compose run fuzzit-regression
+    image: arrow:fuzzit
+    build:
+      context: .
+      dockerfile: dev/fuzzit/Dockerfile
+    environment:
+      CI_ARROW_SHA: ${CI_ARROW_SHA}
+      CI_ARROW_BRANCH: ${CI_ARROW_BRANCH}
+      FUZZIT_JOB_TYPE: regression
+      FUZZIT_API_KEY: 
c0b760d37db6012fcaafd8ca5f412ba7bcd297ac969650502994b51aa11798153824442f999a067e1ef67821989ed664
+    volumes: *ubuntu-volumes
+
+  fuzzit-local-regression:
+    # Run a local fuzzit regression job
+    # Usage:
+    #   docker-compose build cpp
+    #   docker-compose build fuzzit-local-regression
+    #   docker-compose run fuzzit-local-regression
+    image: arrow:fuzzit
+    build:
+      context: .
+      dockerfile: dev/fuzzit/Dockerfile
+    environment:
+      CI_ARROW_SHA: ${CI_ARROW_SHA}
+      CI_ARROW_BRANCH: ${CI_ARROW_BRANCH}
+      FUZZIT_JOB_TYPE: local-regression
     volumes: *ubuntu-volumes
 
   iwyu:

Reply via email to