From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 12 Jun 2019 08:54:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into circleci-docs
X-Git-Tag: dnsdist-1.4.0-rc1~145^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7838%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into circleci-docs
---

f11351402b3eea95952b0f093eb013f9d48175f7
diff --cc .circleci/config.yml
index 9d2161fc23,123a33ee87..ea7d265463
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -845,32 -733,206 +855,230 @@@ jobs
              PDNSRECURSOR="/opt/pdns-recursor/sbin/pdns_recursor" \
              ./runtests recursor
  
 +  build-auth-docs:
 +    docker:
 +      - image: debian:stretch
 +    steps:
 +      - checkout-shallow
 +      - install-doc-deps
 +      - build-auth-docs
 +
 +  build-recursor-docs:
 +    docker:
 +      - image: debian:stretch
 +    steps:
 +      - checkout-shallow
 +      - install-doc-deps
 +      - build-recursor-docs
 +
 +  build-dnsdist-docs:
 +    docker:
 +      - image: debian:stretch
 +    steps:
 +      - checkout-shallow
 +      - install-doc-deps
 +      - build-dnsdist-docs
 +
+   coverity-auth:
+     docker:
+       - image: debian:stretch
+     steps:
+       - install-auth-dev-deps
+       - install-coverity-tools
+       - checkout-shallow
+       - run:
+           name: autoconf
+           command: BUILDER_VERSION=0.0.0-git1 autoreconf -vfi
+       - run:
+           name: configure
+           command: |
+             CFLAGS="-O1 -Werror=vla" \
+             CXXFLAGS="-O1 -Werror=vla" \
+             ./configure \
+               --disable-lua-records \
+               --with-modules='bind lmdb ldap gmysql gsqlite3 gpgsql godbc mydns random tinydns' \
+               --enable-tools \
+               --with-lmdb=/usr \
+               --with-libsodium \
+               --prefix=/opt/pdns-auth
+       - run:
+           name: build
+           command: /usr/local/bin/cov-build --dir cov-int make -j2 -k
+       - run:
+           name: Create Coverity tarball
+           command: tar caf auth.tar.bz2 cov-int
+       - run:
+           name: Upload tarball to coverity
+           command: |
+             curl --form token=${COVERITY_TOKEN} \
+             --form email="${COVERITY_EMAIL}" \
+             --form file=@auth.tar.bz2 \
+             --form version="$(./builder-support/gen-version)" \
+             --form description="master build" \
+             https://scan.coverity.com/builds?project=${COVERITY_PROJECT}
+ 
+   coverity-dnsdist:
+     docker:
+       - image: debian:stretch
+     steps:
+       - run:
+           name: Install dependencies
+           command: |
+             apt-get update && apt-get -qq --no-install-recommends install \
+             autoconf \
+             automake \
+             bison \
+             bzip2 \
+             ca-certificates \
+             curl \
+             flex \
+             g++ \
+             git \
+             libboost-all-dev \
+             libcap-dev \
+             libedit-dev \
+             libfstrm-dev \
+             libluajit-5.1-dev \
+             libprotobuf-dev \
+             libre2-dev \
+             libsnmp-dev \
+             libsodium-dev \
+             libssl-dev \
+             libsystemd-dev \
+             libtool \
+             make \
+             pkg-config \
+             protobuf-compiler \
+             ragel \
+             virtualenv
+       - install-coverity-tools
+       - checkout-shallow
+       - run:
+           name: autoconf
+           command: BUILDER_VERSION=0.0.0-git1 autoreconf -vfi
+           working_directory: ~/project/pdns/dnsdistdist
+       - run:
+           name: configure
+           command: |
+             CFLAGS="-O1 -Werror=vla" \
+             CXXFLAGS="-O1 -Werror=vla" \
+             ./configure \
+             --disable-systemd \
+             --disable-unit-tests \
+             --enable-dnstap \
+             --enable-dnscrypt \
+             --enable-dns-over-tls \
+             --prefix=/opt/dnsdist \
+             --with-libsodium \
+             --with-lua=luajit \
+             --with-libcap \
+             --with-protobuf=yes \
+             --with-re2
+           working_directory: ~/project/pdns/dnsdistdist
+       - run:
+           name: build
+           command: /usr/local/bin/cov-build --dir cov-int make -j2 -k
+           working_directory: ~/project/pdns/dnsdistdist
+       - run:
+           name: Create Coverity tarball
+           command: tar caf dnsdist.tar.bz2 cov-int
+           working_directory: ~/project/pdns/dnsdistdist
+       - run:
+           name: Upload tarball to coverity
+           command: |
+             curl --form token=${COVERITY_TOKEN} \
+             --form email="${COVERITY_EMAIL}" \
+             --form file=@pdns/dnsdistdist/dnsdist.tar.bz2 \
+             --form version="$(./builder-support/gen-version)" \
+             --form description="master build" \
+             https://scan.coverity.com/builds?project=${COVERITY_PROJECT}
+ 
+   coverity-recursor:
+     docker:
+       - image: debian:stretch
+     steps:
+       - run:
+           name: Install dependencies
+           command: |
+             apt-get update && apt-get -qq --no-install-recommends install \
+             autoconf \
+             automake \
+             ca-certificates \
+             curl \
+             bison \
+             bzip2 \
+             flex \
+             g++ \
+             git \
+             libboost-all-dev \
+             libcap-dev \
+             libluajit-5.1-dev \
+             libprotobuf-dev \
+             libsodium-dev \
+             libssl-dev \
+             libsystemd-dev \
+             libtool \
+             make \
+             pkg-config \
+             protobuf-compiler \
+             ragel \
+             virtualenv
+       - install-coverity-tools
+       - checkout-shallow
+       - run:
+           name: autoconf
+           command: BUILDER_VERSION=0.0.0-git1 autoreconf -vfi
+           working_directory: ~/project/pdns/recursordist
+       - run:
+           name: configure
+           command: |
+             CFLAGS="-O1 -Werror=vla" \
+             CXXFLAGS="-O1 -Werror=vla" \
+             ./configure \
+             --disable-systemd \
+             --disable-unit-tests \
+             --prefix=/opt/pdns-recursor \
+             --with-libsodium \
+             --with-lua=luajit \
+             --with-libcap \
+             --with-protobuf=yes \
+             --without-net-snmp
+           working_directory: ~/project/pdns/recursordist
+       - run:
+           name: build
+           command: /usr/local/bin/cov-build --dir cov-int make -j2 -k
+           working_directory: ~/project/pdns/recursordist
+       - run:
+           name: Create Coverity tarball
+           command: tar caf recursor.tar.bz2 cov-int
+           working_directory: ~/project/pdns/recursordist
+       - run:
+           name: Upload tarball to coverity
+           command: |
+             curl --form token=${COVERITY_TOKEN} \
+             --form email="${COVERITY_EMAIL}" \
+             --form file=@pdns/recursordist/recursor.tar.bz2 \
+             --form version="$(./builder-support/gen-version)" \
+             --form description="master build" \
+             https://scan.coverity.com/builds?project=${COVERITY_PROJECT}
+ 
  workflows:
    version: 2
+   coverity:
+     triggers:
+       - schedule:
+           cron: "0 0 * * *"
+           filters:
+             branches:
+               only: master
+     jobs:
+       - coverity-auth:
+           context: auth-coverity
+       - coverity-dnsdist:
+           context: dnsdist-coverity
+       - coverity-recursor:
+           context: recursor-coverity
+ 
    build-and-test-all:
      jobs:
        - build-auth