diff --git a/infra/README.md b/infra/README.md new file mode 100644 index 000000000..e78d94b94 --- /dev/null +++ b/infra/README.md @@ -0,0 +1,7 @@ +Infrastructure +============== + +This directory contains infrastructure definition for oss-fuzz project: + +* `base-images` - docker images used for building fuzzers. +* `jenkins-cluster` - kubernetes cluster definition for our jenkins-based build. diff --git a/infra/base-images/Jenkinsfile b/infra/base-images/Jenkinsfile index baed0cdb3..7166bfeb9 100644 --- a/infra/base-images/Jenkinsfile +++ b/infra/base-images/Jenkinsfile @@ -18,12 +18,12 @@ def dockerOptions="--no-cache" -stage 'Build Docker Images' +stage 'Build Docker Images', concurrency: 1 node { git url: 'https://github.com/google/oss-fuzz/' sh "docker build $dockerOptions --pull -t libfuzzer/base infra/base-images/base" sh "docker build $dockerOptions -t libfuzzer/base-clang infra/base-images/base-clang" - sh "docker build $dockerOptions -t libfuzzer/base-fuzzer infra/base-images/base-fuzzer" + sh "docker build $dockerOptions -t libfuzzer/base-libfuzzer infra/base-images/base-libfuzzer" } stage 'Push Docker Images', concurrency: 1 @@ -37,5 +37,5 @@ node { sh "#!/bin/bash -e\ndocker info\ndocker version\ndocker login -u='${username}' -p='${password}' -e='${email}' https://index.docker.io/v1/" sh "docker push libfuzzer/base" sh "docker push libfuzzer/base-clang" - sh "docker push libfuzzer/base-fuzzer" + sh "docker push libfuzzer/base-libfuzzer" } diff --git a/infra/base-images/base-fuzzer/Dockerfile b/infra/base-images/base-libfuzzer/Dockerfile similarity index 100% rename from infra/base-images/base-fuzzer/Dockerfile rename to infra/base-images/base-libfuzzer/Dockerfile