Merge 0.9.1-rc1 release into 'dev'.

This commit is contained in:
Tim Bruijnzeels
2021-07-16 15:03:54 +02:00
30 changed files with 616 additions and 336 deletions
+270 -127
View File
@@ -1,19 +1,15 @@
# GitHub Actions workflow for building and testing Krill O/S packages.
# Uses GitHub Actions caching to avoid rebuilding Rust cargo-deb and
# Krill dependencies on every run.
# GitHub Actions workflow for building and testing Krill O/S packages. Uses GitHub Actions caching to avoid rebuilding
# Rust cargo-deb , cargo generate-rpm and Krill compiled dependencies on every run.
#
# Note: at the time of writing the GH cache contents expire after a
# week if not used so the next build may be much slower as it will
# have to re-download/build/install lots of Rust crates.
# Note: at the time of writing the GH cache contents expire after a week if not used so the next build may be much
# slower as it will have to re-download/build/install lots of Rust crates.
#
# Packages are built inside Docker containers as GH Runners have extra libraries
# and packages installed which can cause package building to succeed but package
# installation on a real target O/S to fail, due to being built against too
# Packages are built inside Docker containers as GH Runners have extra libraries and packages installed which can cause
# package building to succeed but package installation on a real target O/S to fail, due to being built against too
# recent version of a package such as libssl or glibc.
#
# Packages are tested inside LXC/LXD containers because Docker containers don't
# by default support init managers such as systemd but we want to test systemd
# service unit installation and activation.
# Packages are tested inside LXC/LXD containers because Docker containers don't by default support init managers such as
# systemd but we want to test systemd service unit installation and activation.
name: Packaging
on:
@@ -51,9 +47,12 @@ defaults:
shell: bash --noprofile --norc -eo pipefail -x {0}
jobs:
# Use the cargo-deb Rust crate to build a Debian package for installing
# Krill. See: https://github.com/mmstick/cargo-deb
deb-pkg:
# Use the cargo-deb and cargo-generate-rpm Rust crates to build Debian and RPM packages respectively for installing
# Krill.
# See:
# - https://github.com/mmstick/cargo-deb
# - https://github.com/cat-in-136/cargo-generate-rpm
pkg:
strategy:
matrix:
image: # can't use complex values here, only primitive values are allowed
@@ -63,16 +62,21 @@ jobs:
- 'debian:stretch' # debian/9
- 'debian:buster' # debian/10
- 'debian:bullseye' # debian/11
- 'centos:7'
- 'centos:8'
include:
- image: 'centos:7'
extra_build_args: '--features static-openssl'
env:
CARGO_DEB_VER: 1.28.0
# A Krill version of the form 'x.y.z-plus' denotes a dev build that is
# newer than the released x.y.z version but is not yet a new release.
CARGO_GENERATE_RPM_VER: 0.4.0
# A Krill version of the form 'x.y.z-bis' denotes a dev build that is newer than the released x.y.z version but is
# not yet a new release.
NEXT_VER_LABEL: bis
name: deb-pkg
name: pkg
runs-on: ubuntu-latest
# Build on the oldest platform we are targeting in order to avoid
# https://github.com/rust-lang/rust/issues/57497. Specifying container
# causes all of the steps in this job to run inside a Docker container.
# Build on the oldest platform we are targeting in order to avoid https://github.com/rust-lang/rust/issues/57497.
# Specifying container causes all of the steps in this job to run inside a Docker container.
container: ${{ matrix.image }}
steps:
@@ -80,9 +84,8 @@ jobs:
id: setvars
shell: bash
run: |
# Get the operating system and release name (e.g. ubuntu and xenial) from
# the image name (e.g. ubuntu:xenial) by extracting only the parts before
# and after but not including the colon:
# Get the operating system and release name (e.g. ubuntu and xenial) from the image name (e.g. ubuntu:xenial) by
# extracting only the parts before and after but not including the colon:
echo "OS_NAME=${MATRIX_IMAGE%:*}" >> $GITHUB_ENV
echo "OS_REL=${MATRIX_IMAGE#*:}" >> $GITHUB_ENV
env:
@@ -92,12 +95,19 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v1
# Install Rust the hard way rather than using a GH Action because the action
# doesn't work inside a Docker container.
# Install Rust the hard way rather than using a GH Action because the action doesn't work inside a Docker container.
- name: Install Rust
run: |
apt-get update
apt-get install -y curl
case ${OS_NAME} in
debian|ubuntu)
apt-get update
apt-get install -y curl
;;
centos)
yum update -y
;;
esac
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --profile minimal -y
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
env:
@@ -105,7 +115,17 @@ jobs:
- name: Install compilation and other dependencies
run: |
apt-get install -y build-essential jq libssl-dev lintian pkg-config
case ${OS_NAME} in
debian|ubuntu)
apt-get install -y build-essential jq libssl-dev lintian pkg-config
;;
centos)
yum install epel-release -y
yum update -y
yum install -y jq openssl-devel rpmlint
yum groupinstall -y "Development Tools"
;;
esac
env:
DEBIAN_FRONTEND: noninteractive
@@ -117,33 +137,56 @@ jobs:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ matrix.image }}-cargo-${{ hashFiles('**/Cargo.lock') }}
# Speed up cargo-deb installation by only re-downloading and re-building its
# dependent crates if we change the version of cargo-deb that we are using.
- name: Cache Cargo Deb binary
# Speed up tooling installation by only re-downloading and re-building dependent crates if we change the version of
# the tool that we are using.
- name: Cache Cargo Deb if available
id: cache-cargo-deb
uses: actions/cache@v2
with:
path: ~/.cargo/bin/cargo-deb
key: ${{ matrix.image }}-cargo-deb-${{ env.CARGO_DEB_VER }}
# Only install cargo-deb if not already fetched from the cache.
- name: Install Cargo Deb
- name: Cache Cargo Generate RPM if available
id: cache-cargo-generate-rpm
uses: actions/cache@v2
with:
path: ~/.cargo/bin/cargo-generate-rpm
key: ${{ matrix.image }}-cargo-generate-rpm-${{ env.CARGO_GENERATE_RPM_VER }}
# Only install cargo-deb or cargo-generate-rpm if not already fetched from the cache.
- name: Install Cargo Deb if needed
if: steps.cache-cargo-deb.outputs.cache-hit != 'true'
run: |
cargo install cargo-deb --version $CARGO_DEB_VER
case ${OS_NAME} in
debian|ubuntu)
cargo install cargo-deb --version ${CARGO_DEB_VER}
;;
esac
# Instruct cargo-deb to build the Debian package using the config section
# in Cargo.toml for the specified "variant".
- name: Create the DEB package
- name: Install Cargo Generate RPM if needed
if: steps.cache-cargo-generate-rpm.outputs.cache-hit != 'true'
run: |
# Packages for different distributions (e.g. Stretch, Buster) of the same
# O/S (e.g. Debian) when served from a single package repository MUST have
# unique package_ver_architecture triples. Cargo deb can vary the name based
# on the 'variant' config section in use, but doesn't do so according to
# Debian policy (as it modifies the package name, not the package version).
case ${OS_NAME} in
centos)
cargo install cargo-generate-rpm --version ${CARGO_GENERATE_RPM_VER}
;;
esac
# Instruct cargo-deb or cargo-generate-rpm to build the package based on Cargo.toml settings and command line
# arguments.
- name: Create the package
env:
MATRIX_IMAGE: ${{ matrix.image }}
EXTRA_BUILD_ARGS: ${{ matrix.extra_build_args }}
run: |
# Debian
# ==============================================================================================================
# Packages for different distributions (e.g. Stretch, Buster) of the same O/S (e.g. Debian) when served from a
# single package repository MUST have unique package_ver_architecture triples. Cargo deb can vary the name based
# on the 'variant' config section in use, but doesn't do so according to Debian policy (as it modifies the
# package name, not the package version).
# Format: package_ver_architecture
# Where ver has format: [epoch:]upstream_version[-debian_revision]
# And debian_version should be of the form: 1<xxx>
@@ -151,68 +194,115 @@ jobs:
# See:
# - https://unix.stackexchange.com/a/190899
# - https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
# - https://readme.phys.ethz.ch/documentation/debian_version_numbers/
# Therefore we generate the version ourselves.
#
# In addition, Semantic Versioning and Debian version policy cannot
# express a pre-release label in the same way. For example 0.8.0-rc.1
# is a valid Cargo.toml [package].version value but when used as a
# Debian package version 0.8.0-rc.1 would be considered _NEWER_ than
# the final 0.8.0 release. To express this in a Debian compatible way we
# must replace the dash '-' with a tilda '~'.
# In addition, Semantic Versioning and Debian version policy cannot express a pre-release label in the same way.
# For example 0.8.0-rc.1 is a valid Cargo.toml [package].version value but when used as a Debian package version
# 0.8.0-rc.1 would be considered _NEWER_ than the final 0.8.0 release. To express this in a Debian compatible
# way we must replace the dash '-' with a tilda '~'.
#
# Finally, sometimes we want a version to be NEWER than the latest
# release but without having to decide what higher semver number to bump
# to. In this case we do NOT want dash '-' to become '~' because `-`
# is treated as higher and tilda is treated as lower.
KRILL_VER=$(cargo read-manifest | jq -r '.version' | tr '-' '~')
DEB_KRILL_VER=$(echo $KRILL_VER | sed -e "s/~$NEXT_VER_LABEL/-$NEXT_VER_LABEL/")
# RPM
# ==============================================================================================================
# Handle the release candidate case where the version string needs to have dash replaced by tilda. The cargo
# build command won't work if the version key in Cargo.toml contains a tilda but we have to put the tilda there
# for when we run cargo generate-rpm so that it uses it.
#
# For background on RPM versioning see:
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/
#
# COMMON
# ==============================================================================================================
# Finally, sometimes we want a version to be NEWER than the latest release but without having to decide what
# higher semver number to bump to. In this case we do NOT want dash '-' to become '~' because `-` is treated as
# higher and tilda is treated as lower.
KRILL_VER=$(cargo read-manifest | jq -r '.version')
KRILL_NEW_VER=$(echo $KRILL_VER | tr '-' '~')
PKG_KRILL_VER=$(echo $KRILL_NEW_VER | sed -e "s/~$NEXT_VER_LABEL/-$NEXT_VER_LABEL/")
case ${{ github.event_name }} in
pull_request) MAINTAINER="${{ github.actor }} <unknown@email.address>" ;;
push) MAINTAINER="${{ github.event.pusher.name }} <${{ github.event.pusher.email }}>" ;;
*) echo 2>&1 "ERROR: Unexpected GitHub Actions event"; exit 1 ;;
case ${OS_NAME} in
debian|ubuntu)
case ${{ github.event_name }} in
pull_request) MAINTAINER="${{ github.actor }} <unknown@email.address>" ;;
push) MAINTAINER="${{ github.event.pusher.name }} <${{ github.event.pusher.email }}>" ;;
*) echo 2>&1 "ERROR: Unexpected GitHub Actions event"; exit 1 ;;
esac
# Generate the RFC 5322 format date by hand instead of using date --rfc-email because that option doesn't exist
# on Ubuntu 16.04 and Debian 9
RFC5322_TS=$(LC_TIME=en_US.UTF-8 date +'%a, %d %b %Y %H:%M:%S %z')
# Generate the changelog file that Debian packages are required to have.
# See: https://www.debian.org/doc/manuals/maint-guide/dreq.en.html#changelog
if [ ! -d target/debian ]; then
mkdir -p target/debian
fi
echo "krill (${PKG_KRILL_VER}) unstable; urgency=medium" >target/debian/changelog
echo " * See: https://github.com/NLnetLabs/krill/releases/tag/v${KRILL_NEW_VER}" >>target/debian/changelog
echo " -- maintainer ${MAINTAINER} ${RFC5322_TS}" >>target/debian/changelog
DEB_VER="${PKG_KRILL_VER}-1${OS_REL}"
cargo deb --variant ${OS_NAME}-${OS_REL} --deb-version ${DEB_VER} -v -- --locked ${EXTRA_BUILD_ARGS}
;;
centos)
# Build and strip Krill as cargo generate-rpm doesn't do this for us
cargo build --release --locked -v ${EXTRA_BUILD_ARGS}
strip -s target/release/krill
# Fix the version string to be used for the RPM package
sed -i -e "s/$KRILL_VER/$PKG_KRILL_VER/" Cargo.toml
# Select the correct systemd service unit file for the target operating system
case ${MATRIX_IMAGE} in
ubuntu:xenial|centos:7) SYSTEMD_SERVICE_UNIT_FILE="krill-ubuntu-xenial.krill.service" ;;
ubuntu:bionic) SYSTEMD_SERVICE_UNIT_FILE="krill-ubuntu-bionic.krill.service" ;;
ubuntu:focal|centos:8) SYSTEMD_SERVICE_UNIT_FILE="krill-ubuntu-focal.krill.service" ;;
debian:stretch) SYSTEMD_SERVICE_UNIT_FILE="krill-debian-stretch.krill.service" ;;
debian:buster) SYSTEMD_SERVICE_UNIT_FILE="krill-debian-buster.krill.service" ;;
debian:bullseye) SYSTEMD_SERVICE_UNIT_FILE="krill-debian-bullseye.krill.service" ;;
*) echo >&2 "ERROR: Unsupported matrix image value: '${MATRIX_IMAGE}'" ;;
esac
# Copy the chosen systemd service unit file to where Cargo.toml expects it to be
mkdir -p target/rpm
cp pkg/common/${SYSTEMD_SERVICE_UNIT_FILE} target/rpm/krill.service
cargo generate-rpm
;;
esac
# Generate the RFC 5322 format date by hand instead of using date --rfc-email
# because that option doesn't exist on Ubuntu 16.04 and Debian 9
RFC5322_TS=$(LC_TIME=en_US.UTF-8 date +'%a, %d %b %Y %H:%M:%S %z')
# Generate the changelog file that Debian packages are required to have.
# See: https://www.debian.org/doc/manuals/maint-guide/dreq.en.html#changelog
echo "krill (${DEB_KRILL_VER}) unstable; urgency=medium" >debian/changelog
echo " * See: https://github.com/NLnetLabs/krill/releases/tag/v${KRILL_VER}" >>debian/changelog
echo " -- maintainer ${MAINTAINER} ${RFC5322_TS}" >>debian/changelog
DEB_VER="${DEB_KRILL_VER}-1${OS_REL}"
cargo deb --variant ${OS_NAME}-${OS_REL} --deb-version ${DEB_VER} -v -- --locked
# See what Lintian thinks of our package.
- name: Verify the DEB package
# See what O/S specific linting tools think of our package.
- name: Verify the package
run: |
lintian -v target/debian/*.deb
case ${OS_NAME} in
debian|ubuntu)
lintian -v target/debian/*.deb
;;
centos)
# cargo generate-rpm creates RPMs that rpmlint considers to have
# errors so don't use the rpmlint exit code otherwise we will always
# abort the workflow.
rpmlint target/generate-rpm/*.rpm || true
;;
esac
# Upload the produced DEB package. The artifact will be available
# via the GH Actions job summary and build log pages, but only to
# users logged in to GH with sufficient rights in this project. The
# uploaded artifact is also downloaded by the next job (see below)
# to sanity check that it can be installed and results in a working
# Krill installation.
- name: Upload DEB package
# Upload the produced package. The artifact will be available via the GH Actions job summary and build log pages,
# but only to users logged in to GH with sufficient rights in this project. The uploaded artifact is also downloaded
# by the next job (see below) to sanity check that it can be installed and results in a working Krill installation.
- name: Upload package
uses: actions/upload-artifact@v2
with:
name: ${{ env.OS_NAME }}_${{ env.OS_REL }}
path: target/debian/*.deb
path: |
target/debian/*.deb
target/generate-rpm/*.rpm
# Download and sanity check on target operating systems the packages created
# by previous jobs (see above). Don't test on GH runners as they come with
# lots of software and libraries pre-installed and thus are not representative
# of the actual deployment targets, nor do GH runners support all targets that
# we want to test. Don't test in Docker containers as they do not support
# systemd.
deb-pkg-test:
name: deb-pkg-test
needs: deb-pkg
# Download and sanity check on target operating systems the packages created by previous jobs (see above). Don't test
# on GH runners as they come with lots of software and libraries pre-installed and thus are not representative of the
# actual deployment targets, nor do GH runners support all targets that we want to test. Don't test in Docker
# containers as they do not support systemd.
pkg-test:
name: pkg-test
needs: pkg
runs-on: ubuntu-latest
strategy:
fail-fast: false
@@ -224,23 +314,27 @@ jobs:
- 'debian:stretch' # debian/9
- 'debian:buster' # debian/10
- 'debian:bullseye' # debian/11
- 'centos:7'
- 'centos:8'
mode:
- 'fresh-install'
- 'upgrade-from-published'
exclude:
- image: 'debian:bullseye'
mode: 'upgrade-from-published'
- image: 'centos:7'
mode: 'upgrade-from-published'
- image: 'centos:8'
mode: 'upgrade-from-published'
steps:
# Set some environment variables that will be available to "run" steps below
# in this job, and some output variables that will be available in GH Action
# step definitions below.
# Set some environment variables that will be available to "run" steps below in this job, and some output variables
# that will be available in GH Action step definitions below.
- name: Set vars
id: setvars
shell: bash
run: |
# Get the operating system and release name (e.g. ubuntu and xenial) from
# the image name (e.g. ubuntu:xenial) by extracting only the parts before
# and after but not including the colon:
# Get the operating system and release name (e.g. ubuntu and xenial) from the image name (e.g. ubuntu:xenial) by
# extracting only the parts before and after but not including the colon:
OS_NAME=${MATRIX_IMAGE%:*}
OS_REL=${MATRIX_IMAGE#*:}
@@ -250,7 +344,7 @@ jobs:
env:
MATRIX_IMAGE: ${{ matrix.image }}
- name: Download DEB package
- name: Download package
uses: actions/download-artifact@v2
with:
name: ${{ env.OS_NAME }}_${{ env.OS_REL }}
@@ -267,19 +361,24 @@ jobs:
run: |
sg lxd -c "lxc info"
# Use of IPv6 sometimes prevents yum update being able to resolve
# mirrorlist.centos.org.
- name: Disable LXD assignment of IPv6 addresses
run: |
sg lxd -c "lxc network set lxdbr0 ipv6.address none"
- name: Launch LXC container
run: |
# security.nesting=true is needed to avoid error "Failed to set up mount
# namespacing: Permission denied" in a Debian 10 container.
# security.nesting=true is needed to avoid error "Failed to set up mount namespacing: Permission denied" in a
# Debian 10 container.
sg lxd -c "lxc launch ${LXC_IMAGE} -c security.nesting=true testcon"
# Run apt-get update and install man and sudo support (missing in some LXC/LXD
# O/S images) but first wait for cloud-init to finish otherwise the network
# isn't yet ready. Don't use cloud-init status --wait as that isn't supported
# on older O/S's like Ubuntu 16.04 and Debian 9. Use the sudo package provided
# configuration files otherwise when using sudo we get an error that the root
# user isn't allowed to use sudo.
# Run package update and install man and sudo support (missing in some
# LXC/LXD O/S images) but first wait for cloud-init to finish otherwise the
# network isn't yet ready. Don't use cloud-init status --wait as that isn't
# supported on older O/S's like Ubuntu 16.04 and Debian 9. Use the sudo
# package provided configuration files otherwise when using sudo we get an
# error that the root user isn't allowed to use sudo.
- name: Prepare container
shell: bash
run: |
@@ -287,29 +386,66 @@ jobs:
while ! sudo lxc exec testcon -- ls -la /var/lib/cloud/data/result.json; do
sleep 1s
done
sg lxd -c "lxc exec testcon -- apt-get update"
sg lxd -c "lxc exec testcon -- apt-get install -y -o Dpkg::Options::=\"--force-confnew\" apt-transport-https gnupg2 man sudo wget"
- name: Copy DEB into LXC container
case ${OS_NAME} in
debian|ubuntu)
sg lxd -c "lxc exec testcon -- apt-get update"
sg lxd -c "lxc exec testcon -- apt-get install -y -o Dpkg::Options::=\"--force-confnew\" apt-transport-https ca-certificates man sudo wget"
;;
centos)
sg lxd -c "lxc exec testcon -- yum update -y"
sg lxd -c "lxc exec testcon -- yum install -y man"
;;
esac
- name: Copy package into the LXC container
run: |
DEB_FILE=$(ls -1 *.deb)
sg lxd -c "lxc file push ${DEB_FILE} testcon/tmp/"
echo "DEB_FILE=${DEB_FILE}" >> $GITHUB_ENV
case ${OS_NAME} in
debian|ubuntu)
DEB_FILE=$(ls -1 debian/*.deb)
sg lxd -c "lxc file push ${DEB_FILE} testcon/tmp/"
echo "PKG_FILE=$(basename $DEB_FILE)" >> $GITHUB_ENV
;;
centos)
RPM_FILE=$(ls -1 generate-rpm/*.rpm)
sg lxd -c "lxc file push ${RPM_FILE} testcon/tmp/"
echo "PKG_FILE=$(basename $RPM_FILE)" >> $GITHUB_ENV
;;
esac
- name: Install published DEB package
- name: Install previously published package
if: ${{ matrix.mode == 'upgrade-from-published' }}
run: |
echo "deb [arch=amd64] https://packages.nlnetlabs.nl/linux/${OS_NAME}/ ${OS_REL} main" >$HOME/nlnetlabs.list
sg lxd -c "lxc file push $HOME/nlnetlabs.list testcon/etc/apt/sources.list.d/"
sg lxd -c "lxc exec testcon -- wget -q https://packages.nlnetlabs.nl/aptkey.asc"
sg lxd -c "lxc exec testcon -- apt-key add ./aptkey.asc"
sg lxd -c "lxc exec testcon -- apt update"
sg lxd -c "lxc exec testcon -- apt install -y krill"
case ${OS_NAME} in
debian|ubuntu)
echo "deb [arch=amd64] https://packages.nlnetlabs.nl/linux/${OS_NAME}/ ${OS_REL} main" >$HOME/nlnetlabs.list
sg lxd -c "lxc file push $HOME/nlnetlabs.list testcon/etc/apt/sources.list.d/"
sg lxd -c "lxc exec testcon -- wget -q https://packages.nlnetlabs.nl/aptkey.asc"
sg lxd -c "lxc exec testcon -- apt-key add ./aptkey.asc"
sg lxd -c "lxc exec testcon -- apt update"
sg lxd -c "lxc exec testcon -- apt install -y krill"
;;
centos)
rpm --import https://packages.nlnetlabs.nl/aptkey.asc
cat "[nlnetlabs]" >/etc/yum.repos.d/nlnetlabs.repo
cat "name=NLnet Labs" >>/etc/yum.repos.d/nlnetlabs.repo
cat "baseurl=https://packages.nlnetlabs.nl/linux/centos/$releasever/main/$basearch" >>/etc/yum.repos.d/nlnetlabs.repo
cat "enabled=1" >>/etc/yum.repos.d/nlnetlabs.repo
yum install -y krill
;;
esac
- name: Install new DEB package
- name: Install new package
if: ${{ matrix.mode == 'fresh-install' }}
run: |
sg lxd -c "lxc exec testcon -- apt-get -y install /tmp/${DEB_FILE}"
case ${OS_NAME} in
debian|ubuntu)
sg lxd -c "lxc exec testcon -- apt-get -y install /tmp/${PKG_FILE}"
;;
centos)
sg lxd -c "lxc exec testcon -- yum install -y /tmp/${PKG_FILE}"
;;
esac
- name: Test installed packages
run: |
@@ -344,10 +480,17 @@ jobs:
echo -e "\nKRILL MAN PAGE:"
sg lxd -c "lxc exec testcon -- man -P cat krill"
- name: Install new DEB package
- name: Install new package
if: ${{ matrix.mode == 'upgrade-from-published' }}
run: |
sg lxd -c "lxc exec testcon -- apt-get -y install /tmp/${DEB_FILE}"
case ${OS_NAME} in
debian|ubuntu)
sg lxd -c "lxc exec testcon -- apt-get -y install /tmp/${PKG_FILE}"
;;
centos)
sg lxd -c "lxc exec testcon -- yum install -y /tmp/${PKG_FILE}"
;;
esac
- name: Test installed packages
if: ${{ matrix.mode == 'upgrade-from-published' }}