From bddc4d7fee5a7483e3d5c468fb369b90b6328de2 Mon Sep 17 00:00:00 2001 From: Mike Aizatsky Date: Tue, 6 Dec 2016 21:50:51 -0800 Subject: [PATCH] [infra] using all.sh instead of jenkins script --- infra/base-images/Jenkinsfile | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/infra/base-images/Jenkinsfile b/infra/base-images/Jenkinsfile index af380d825..603bad3b6 100644 --- a/infra/base-images/Jenkinsfile +++ b/infra/base-images/Jenkinsfile @@ -15,27 +15,7 @@ //////////////////////////////////////////////////////////////////////////////// // Jenkins build script for base images. - -def dockerOptions="--no-cache" - node { git url: 'https://github.com/google/oss-fuzz/' - - - dir ("infra/base-images") { - stage name: 'ossfuzz/base', concurrency: 1 - sh "docker build $dockerOptions --pull -t ossfuzz/base base" - - stage name: 'ossfuzz/base-clang', concurrency: 1 - sh "docker build $dockerOptions -t ossfuzz/base-clang base-clang" - - stage name: 'ossfuzz/base-libfuzzer', concurrency: 1 - sh "docker build $dockerOptions -t ossfuzz/base-libfuzzer base-libfuzzer" - - stage name: 'ossfuzz/base-runner', concurrency: 1 - sh "docker build $dockerOptions -t ossfuzz/base-runner base-runner" - - stage name: 'ossfuzz/libfuzzer-runner', concurrency: 1 - sh "docker build $dockerOptions -t ossfuzz/libfuzzer-runner libfuzzer-runner" - } + sh "infra/base-images/all.sh --no-cache" }