From c39d1bad972068410d8070effed8dc67229fdba2 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Wed, 16 Jun 2021 16:37:11 -0400 Subject: [PATCH] Added basic jobs to convert to Zuul --- .travis.yml | 29 ----------------------------- zuul.d/jobs.yaml | 35 +++++++++++++++++++++++++++++++++++ zuul.d/playbooks/.zuul.ignore | 0 zuul.d/playbooks/pre.yaml | 18 ++++++++++++++++++ zuul.d/playbooks/run.yaml | 6 ++++++ 5 files changed, 59 insertions(+), 29 deletions(-) delete mode 100755 .travis.yml create mode 100644 zuul.d/jobs.yaml create mode 100644 zuul.d/playbooks/.zuul.ignore create mode 100644 zuul.d/playbooks/pre.yaml create mode 100644 zuul.d/playbooks/run.yaml diff --git a/.travis.yml b/.travis.yml deleted file mode 100755 index 569ae27b6..000000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: c -sudo: required -services: - - docker -addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - packages: - - lcov - - clang-3.7 - - libev-dev - - libc-ares-dev - - libstdc++-4.8-dev - - libidn2-0-dev - - libssh2-1-dev - - krb5-user - - pkg-config - -matrix: - include: - - env: T=mainline - - env: T=codecoverage - - env: T=codeprofile - - env: T=travisoss - -script: - - ./${T}.sh diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml new file mode 100644 index 000000000..005d85a62 --- /dev/null +++ b/zuul.d/jobs.yaml @@ -0,0 +1,35 @@ +- job: + name: curl-fuzz-base + abstract: true + pre-run: zuul.d/playbooks/pre.yaml + run: zuul.d/playbooks/run.yaml + nodeset: ubuntu-focal + +- job: + name: curl-fuzz-mainline + vars: + curl_test: mainline + +- job: + name: curl-fuzz-code-coverage + vars: + curl_test: codecoverage + +- job: + name: curl-fuzz-code-profile + vars: + curl_test: codeprofile + +- job: + name: curl-fuzz-oss + vars: + curl_test: oss-fuzz + curl_script: travisoss + +- project: + check: + jobs: + - curl-fuzz-mainline + - curl-fuzz-code-coverage + - curl-fuzz-code-profile + - curl-fuzz-oss \ No newline at end of file diff --git a/zuul.d/playbooks/.zuul.ignore b/zuul.d/playbooks/.zuul.ignore new file mode 100644 index 000000000..e69de29bb diff --git a/zuul.d/playbooks/pre.yaml b/zuul.d/playbooks/pre.yaml new file mode 100644 index 000000000..7a9e30051 --- /dev/null +++ b/zuul.d/playbooks/pre.yaml @@ -0,0 +1,18 @@ +- hosts: all + roles: + - role: ensure-docker + when: curl_test == 'oss-fuzz' + tasks: + - name: Install dependencies + become: true + apt: + name: + - lcov + - clang-3.7 + - libev-dev + - libc-ares-dev + - libstdc++-4.8-dev + - libidn2-0-dev + - libssh2-1-dev + - krb5-user + - pkg-config \ No newline at end of file diff --git a/zuul.d/playbooks/run.yaml b/zuul.d/playbooks/run.yaml new file mode 100644 index 000000000..e1dd647af --- /dev/null +++ b/zuul.d/playbooks/run.yaml @@ -0,0 +1,6 @@ +- hosts: all + tasks: + - name: Run job + shell: ./{{ curl_script | default(curl_test) }}.sh + environment: + TRAVIS_BRANCH: "{{ zuul.projects.checkout }}" \ No newline at end of file