...
 
Commits (16)
......@@ -67,13 +67,13 @@ stages:
# Drop the testing repository.
- sed -i '$ d' /etc/apk/repositories
- apk add qemu-system-x86_64 qemu-img
- VERSIONS="${VERSIONS}" ISO_URL="${ISO_URL}" ISO_CHECKSUM="${ISO_CHECKSUM}" KYUA_GIT_COMMIT="$KYUA_GIT_COMMIT" make -C packer/
- VERSIONS="${VERSIONS}" RELEASE="${RELEASE}" ISO_URL="${ISO_URL}" ISO_CHECKSUM="${ISO_CHECKSUM}" KYUA_GIT_COMMIT="$KYUA_GIT_COMMIT" make -C packer/
alpine:3.11:amd64:docker:
alpine:3.12:amd64:docker:
stage: images
variables:
DISTROS: alpine
VERSIONS: "3.11"
VERSIONS: "3.12"
ARCHS: amd64
<<: *linux_amd64
<<: *docker_image_job
......@@ -146,8 +146,9 @@ centos:6:amd64:packer:
variables:
DISTROS: centos
VERSIONS: 6
RELEASE: "6.10"
ARCHS: amd64
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/${RELEASE}/isos/x86_64/CentOS-6.10-x86_64-minimal.iso
ISO_CHECKSUM: 7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770
<<: *linux_amd64
<<: *kvm_image_job
......@@ -166,9 +167,10 @@ centos:7:amd64:packer:
variables:
DISTROS: centos
VERSIONS: 7
RELEASE: "7.8.2003"
ARCHS: amd64
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/7.7.1908/isos/x86_64/CentOS-7-x86_64-Minimal-1908.iso
ISO_CHECKSUM: 9a2c47d97b9975452f7d582264e9fc16d108ed8252ac6816239a3b58cef5c53d
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/${RELEASE}/isos/x86_64/CentOS-7-x86_64-Minimal-2003.iso
ISO_CHECKSUM: 659691c28a0e672558b003d223f83938f254b39875ee7559d1a4a14c79173193
<<: *linux_amd64
<<: *kvm_image_job
rules:
......@@ -186,9 +188,10 @@ centos:8:amd64:packer:
variables:
DISTROS: centos
VERSIONS: 8
RELEASE: "8.2.2004"
ARCHS: amd64
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/8.1.1911/isos/x86_64/CentOS-8.1.1911-x86_64-boot.iso
ISO_CHECKSUM: 7fea13202bf2f26989df4175aace8fdc16e1137f7961c33512cbfad844008948
ISO_URL: ${CENTOS_ISO_MIRROR_URL}/${RELEASE}/isos/x86_64/CentOS-8.2.2004-x86_64-boot.iso
ISO_CHECKSUM: c67876a5602faa17f68b40ccf2628799b87454aa67700f0f57eec15c6ccdd98c
<<: *linux_amd64
<<: *kvm_image_job
rules:
......@@ -201,11 +204,11 @@ centos:8:amd64:packer:
- packer/centos/*
when: always
fedora:31:amd64:docker:
fedora:32:amd64:docker:
stage: images
variables:
DISTROS: fedora
VERSIONS: 31
VERSIONS: 32
ARCHS: amd64
<<: *linux_amd64
<<: *docker_image_job
......@@ -314,11 +317,11 @@ ubuntu:xenial:amd64:docker:
- docker/bind9/debian-template/*
when: always
ubuntu:bionic:amd64:docker:
ubuntu:focal:amd64:docker:
stage: images
variables:
DISTROS: ubuntu
VERSIONS: bionic
VERSIONS: focal
ARCHS: amd64
<<: *linux_amd64
<<: *docker_image_job
......@@ -404,14 +407,14 @@ website:rsync_ssh_curl:docker:
- docker/website/rsync_ssh_curl/*
when: always
freebsd:11.3:amd64:packer:
freebsd:11.4:amd64:packer:
stage: images
variables:
DISTROS: freebsd
VERSIONS: "11.3"
VERSIONS: "11.4"
ARCHS: amd64
ISO_URL: http://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.3/FreeBSD-11.3-RELEASE-amd64-disc1.iso
ISO_CHECKSUM: d268db365e26305ec3d51b29211caad903749c33a4a8f2cf661d671f8e0ba0b0
ISO_URL: http://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/11.4/FreeBSD-11.4-RELEASE-amd64-disc1.iso
ISO_CHECKSUM: d76c1ded99b2c1005b1ff94cc0c811fbcd8a2d04196432009ab5f203c2146914
<<: *linux_amd64
<<: *kvm_image_job
rules:
......@@ -444,14 +447,14 @@ freebsd:12.1:amd64:packer:
- packer/freebsd/*
when: always
openbsd:6.6:amd64:packer:
openbsd:6.7:amd64:packer:
stage: images
variables:
DISTROS: openbsd
VERSIONS: "6.6"
VERSIONS: "6.7"
ARCHS: amd64
ISO_URL: https://cdn.openbsd.org/pub/OpenBSD/6.6/amd64/install66.iso
ISO_CHECKSUM: b22e63df56e6266de6bbeed8e9be0fbe9ee2291551c5bc03f3cc2e4ab9436ee3
ISO_URL: https://cdn.openbsd.org/pub/OpenBSD/6.7/amd64/install67.iso
ISO_CHECKSUM: 097e0fd122fb792a070ad2836e762100d020c5c82da72fe25f3c7a1c844974f5
<<: *linux_amd64
<<: *kvm_image_job
rules:
......
DISTROS ?= alpine centos debian fedora tumbleweed ubuntu
ARCHS ?= amd64 i386
default_alpine_VERSIONS := 3.10 3.11
default_alpine_VERSIONS := 3.12
default_centos_VERSIONS := centos6 centos7 centos8
default_debian_VERSIONS := stretch buster bullseye sid
default_fedora_VERSIONS := 30 31
default_debian_VERSIONS := stretch buster sid
default_fedora_VERSIONS := 32
default_tumbleweed_VERSIONS := latest
default_ubuntu_VERSIONS := xenial bionic
default_ubuntu_VERSIONS := xenial focal
ifneq (,$(VERSIONS))
alpine_VERSIONS = $(filter $(VERSIONS),$(default_alpine_VERSIONS))
centos_VERSIONS = $(filter $(VERSIONS),$(default_centos_VERSIONS))
......@@ -25,7 +25,7 @@ endif
# Define where softhsm and what version gets installed
softhsm_debian_buster_amd64 := 2
softhsm_fedora_31_amd64 := 2
softhsm_fedora_32_amd64 := 2
# Define extras
abi_check_debian_buster_amd64 := yes
......@@ -34,7 +34,7 @@ compiledb_debian_buster_amd64 := yes
cppcheck_debian_buster_amd64 := yes
nodejs_debian_buster_amd64 := 12
danger_debian_buster_amd64 := yes
dnstap_alpine_3.11_amd64 := yes
dnstap_alpine_3.12_amd64 := yes
dnstap_debian_buster_amd64 := yes
dnstap_centos_centos7_amd64 := yes
dnstap_debian_sid_amd64 := yes
......
......@@ -23,6 +23,7 @@ RUN apk add \
libxslt \
lmdb-dev \
make \
musl-dbg \
openssl-dev \
perl \
perl-digest-hmac \
......@@ -54,3 +55,6 @@ RUN if [ ! -s /kyua.tar ]; then \
tar --directory /tmp/kyua-cache-root --create --file /kyua.tar . ; \
fi
RUN tar --extract --file /kyua.tar
# Fix a packaging bug in lmdb-dev-0.9.25-r0
# (https://git.alpinelinux.org/aports/commit/main/lmdb/APKBUILD?id=feb3450d53e97b4926c4eef419c2a7fc33213512)
RUN sed -i -E 's|\$([a-z_]+)|${\1}|' /usr/lib/pkgconfig/lmdb.pc
......@@ -109,7 +109,7 @@ RUN if [ -n "@NODEJS@" ] && [ "@DANGER@" = "yes" ]; then npm install -g danger@9
# https://github.com/danger/python/pull/8, https://github.com/danger/python/pull/9
RUN if [ -n "@NODEJS@" ] && [ "@DANGER@" = "yes" ]; then pip3 install danger-python && sed -i '/CAN_BE_MERGED/{p;s|CAN|CANNOT|;s|can|cannot|}; s|OPEN = "open"|OPEN = "opened"|' /usr/local/lib/python3.7/dist-packages/danger_python/models.py; fi
RUN if [ "@DNSTAP@" = "yes" ]; then apt-get -y install libfstrm-dev libprotobuf-c-dev protobuf-c-compiler; fi
RUN if [ "@PYTHON_QA@" = "yes" ]; then pip3 install flake8==3.8.1 pylint==2.5.2; fi
RUN if [ "@PYTHON_QA@" = "yes" ]; then pip3 install flake8==3.8.3 pylint==2.5.3; fi
RUN if [ "@RESPDIFF@" = "yes" ]; then apt-get -y install python3-dpkt python3-lmdb python3-numpy python3-scipy python3-tabulate; fi
RUN if [ "@SHELLCHECK@" = "yes" ]; then apt-get -y install shellcheck; fi
RUN if [ "@SOFTHSM@" -ge "2" ] 2>/dev/null; then apt-get -y install libsofthsm2 softhsm2; fi
......
......@@ -7,9 +7,11 @@ RUN dnf -y install \
ccache \
curl \
diffutils \
flamethrower \
gcc \
gdb \
git \
gnuplot \
iproute \
json-c-devel \
krb5-devel \
......
......@@ -2,8 +2,8 @@ CI_REGISTRY_IMAGE ?= registry.gitlab.isc.org/isc-projects/images
DISTROS ?= centos freebsd openbsd
default_centos_VERSIONS := 6 7 8
default_freebsd_VERSIONS := 11.3 12.1
default_openbsd_VERSIONS := 6.6
default_freebsd_VERSIONS := 11.4 12.1
default_openbsd_VERSIONS := 6.7
ifneq (,$(VERSIONS))
centos_VERSIONS = $(filter $(VERSIONS),$(default_centos_VERSIONS))
freebsd_VERSIONS = $(filter $(VERSIONS),$(default_freebsd_VERSIONS))
......@@ -36,7 +36,7 @@ $(TARGETS): VERSION = $(word 2,$(subst -, ,$@))
$(TARGETS): ISO_URL ?= $($(VENDOR)_$(subst .,_,$(VERSION))_iso_url)
$(TARGETS): ISO_CHECKSUM ?= $($(VENDOR)_$(subst .,_,$(VERSION))_iso_checksum)
$(TARGETS):
BUILD_PARALLEL_JOBS="$(BUILD_PARALLEL_JOBS)" QCOW2_IMAGE="$(QCOW2_IMAGE)" make -C $(VENDOR) prepare
BUILD_PARALLEL_JOBS="$(BUILD_PARALLEL_JOBS)" QCOW2_IMAGE="$(QCOW2_IMAGE)" RELEASE="$(RELEASE)" make -C $(VENDOR) prepare
cd "$(VENDOR)/$(QCOW2_IMAGE)" && ISO_URL="$(ISO_URL)" ISO_CHECKSUM="$(ISO_CHECKSUM)" QCOW2_IMAGE="$(QCOW2_IMAGE)" packer build packer.json
sed -e 's,@QCOW2_IMAGE@,$(QCOW2_IMAGE),g' < Dockerfile.in > "$(VENDOR)/$(QCOW2_IMAGE)/output-qemu/Dockerfile"
docker build -t "$(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME)" "$(VENDOR)/$(QCOW2_IMAGE)/output-qemu"
......
CENTOS_MIRROR_BASE_URL ?= http://mirror.centos.org/centos/
CENTOS_MIRROR_BASE_URL ?= http://mirror.centos.org/centos
QCOW2_IMAGE ?= centos-6-x86_64
centos_6_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/6/os/x86_64/
centos_7_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/7/os/x86_64/
centos_8_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/8/BaseOS/x86_64/os/
centos_6_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/$(RELEASE)/os/x86_64/
centos_7_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/$(RELEASE)/os/x86_64/
centos_8_x86_64_MIRROR_URL := $(CENTOS_MIRROR_BASE_URL)/$(RELEASE)/BaseOS/x86_64/os/
.PHONY: prepare
......
......@@ -6,7 +6,7 @@ echo "kern.corefile=core.%P" >> /etc/sysctl.conf
sysrc hostname="freebsd"
ASSUME_ALWAYS_YES=yes pkg install bash cmocka fstrm gdb git json-c libmaxminddb libuv libxml2 p5-Net-DNS pkgconf protobuf-c py37-dnspython py37-pip py37-ply py37-pytest py37-requests sudo
ASSUME_ALWAYS_YES=yes pkg install bash cmocka flamethrower fstrm gdb git gnuplot json-c libmaxminddb libtool libuv libxml2 lmdb p5-Net-DNS pkgconf protobuf-c py37-dnspython py37-pip py37-ply py37-pytest py37-requests sudo
# Prefer GDB from ports
if [ -x /usr/bin/gdb ]; then
......@@ -14,14 +14,7 @@ if [ -x /usr/bin/gdb ]; then
fi
# Fetch and apply all available binary updates
freebsd-update --not-running-from-cron fetch
freebsd-update install
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244493
ASSUME_ALWAYS_YES=yes pkg install gmake
curl -sSL "https://github.com/LMDB/lmdb/archive/LMDB_0.9.24.tar.gz" | tar -C /usr/src -xzf -
cd /usr/src/lmdb-LMDB_0.9.24/libraries/liblmdb
gmake -j@BUILD_PARALLEL_JOBS@ CC=clang && gmake install
freebsd-update --not-running-from-cron fetch install
ASSUME_ALWAYS_YES=yes pkg install automake lutok
curl -sSL "https://github.com/Mno-hime/kyua/archive/@KYUA_GIT_COMMIT@.tar.gz" | tar -C /usr/src -xzf -
......
QCOW2_IMAGE ?= openbsd-6.6-x86_64
QCOW2_IMAGE ?= openbsd-6.7-x86_64
.PHONY: prepare
......