From 58c5ffad593e5458b864dba2c526ec8b5bf57138 Mon Sep 17 00:00:00 2001 From: Jannik Peters Date: Fri, 20 Mar 2026 16:49:09 +0100 Subject: [PATCH 01/10] Update test-version jobs --- integration-tests/system-tests.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/integration-tests/system-tests.yml b/integration-tests/system-tests.yml index a171a5661..1998ec818 100644 --- a/integration-tests/system-tests.yml +++ b/integration-tests/system-tests.yml @@ -56,6 +56,7 @@ defaults: shell: bash --noprofile --norc -eo pipefail -x {0} jobs: + # These test jobs can be used to verify which binaries have been used test-release-version: name: Example test with prepare environment and cascade --version (release) runs-on: ubuntu-latest @@ -68,9 +69,14 @@ jobs: - uses: ./.github/actions/set-build-profile with: build-profile: release - - run: cascade --version - - run: file $(which cascade) + - name: Print cascaden and dnst versions and used binaries + run: | + cascade --version + realpath $(which cascade) + dnst --version + realpath $(which dnst) + # These test jobs can be used to verify which binaries have been used test-version: name: Example test with prepare environment and cascade --version (debug) runs-on: ubuntu-latest @@ -80,8 +86,12 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/prepare-systest-env - - run: cascade --version - - run: file $(which cascade) + - name: Print cascaden and dnst versions and used binaries + run: | + cascade --version + realpath $(which cascade) + dnst --version + realpath $(which dnst) add-zone-query: name: Add a zone, query the published zone From ba2258f543cacacc943011e6c311c84f5a49108e Mon Sep 17 00:00:00 2001 From: Jannik Peters Date: Fri, 20 Mar 2026 16:49:39 +0100 Subject: [PATCH 02/10] Setup proposed repo in Dockerfile --- integration-tests/cascade-test-image/Dockerfile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/integration-tests/cascade-test-image/Dockerfile b/integration-tests/cascade-test-image/Dockerfile index efd188728..ce8d854e4 100644 --- a/integration-tests/cascade-test-image/Dockerfile +++ b/integration-tests/cascade-test-image/Dockerfile @@ -13,8 +13,19 @@ RUN < /dev/null # Node.js (for common Actions scripts) apt-get install -y nodejs From 1606dfb5766e35a9fc44a624c609a900a4c561db Mon Sep 17 00:00:00 2001 From: Jannik Peters Date: Fri, 20 Mar 2026 16:49:52 +0100 Subject: [PATCH 03/10] Install dnst with apt --- integration-tests/cascade-test-image/Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/integration-tests/cascade-test-image/Dockerfile b/integration-tests/cascade-test-image/Dockerfile index ce8d854e4..d7f3d9625 100644 --- a/integration-tests/cascade-test-image/Dockerfile +++ b/integration-tests/cascade-test-image/Dockerfile @@ -39,6 +39,20 @@ RUN < Date: Fri, 20 Mar 2026 16:50:19 +0100 Subject: [PATCH 04/10] Use released dnst from apt --- integration-tests/cascade-test-image/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/integration-tests/cascade-test-image/Dockerfile b/integration-tests/cascade-test-image/Dockerfile index d7f3d9625..b4b87683b 100644 --- a/integration-tests/cascade-test-image/Dockerfile +++ b/integration-tests/cascade-test-image/Dockerfile @@ -72,11 +72,12 @@ RUN < Date: Thu, 16 Apr 2026 09:33:09 +0200 Subject: [PATCH 05/10] Fix typo Co-authored-by: Philip-NLnetLabs --- integration-tests/system-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/system-tests.yml b/integration-tests/system-tests.yml index 1998ec818..cfe4f4bbf 100644 --- a/integration-tests/system-tests.yml +++ b/integration-tests/system-tests.yml @@ -86,7 +86,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/prepare-systest-env - - name: Print cascaden and dnst versions and used binaries + - name: Print cascade and dnst versions and used binaries run: | cascade --version realpath $(which cascade) From 9f394bcc44e912c33dfc260c27d860a31f35065c Mon Sep 17 00:00:00 2001 From: Jannik Peters Date: Thu, 16 Apr 2026 09:33:36 +0200 Subject: [PATCH 06/10] Update integration-tests/cascade-test-image/Dockerfile Co-authored-by: Ximon Eighteen <3304436+ximon18@users.noreply.github.com> --- integration-tests/cascade-test-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/cascade-test-image/Dockerfile b/integration-tests/cascade-test-image/Dockerfile index b4b87683b..610f45ffd 100644 --- a/integration-tests/cascade-test-image/Dockerfile +++ b/integration-tests/cascade-test-image/Dockerfile @@ -40,7 +40,7 @@ RUN < Date: Thu, 16 Apr 2026 09:39:46 +0200 Subject: [PATCH 07/10] Turn dnst debug build version into a variable too and use the git tag --- integration-tests/cascade-test-image/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-tests/cascade-test-image/Dockerfile b/integration-tests/cascade-test-image/Dockerfile index 610f45ffd..330a7cdbe 100644 --- a/integration-tests/cascade-test-image/Dockerfile +++ b/integration-tests/cascade-test-image/Dockerfile @@ -44,6 +44,7 @@ EOF # have to manually invalidate the cached version of the RUN step below as the # RUN step content wouldn't change. ARG DNST_VERSION=0.2.0~alpha1-1noble +ARG DNST_VERSION_CARGO=v0.2.0-alpha1 RUN < Date: Thu, 16 Apr 2026 09:40:30 +0200 Subject: [PATCH 08/10] Skip unnecessary tee --- integration-tests/cascade-test-image/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/cascade-test-image/Dockerfile b/integration-tests/cascade-test-image/Dockerfile index 330a7cdbe..a6bccdd70 100644 --- a/integration-tests/cascade-test-image/Dockerfile +++ b/integration-tests/cascade-test-image/Dockerfile @@ -24,8 +24,8 @@ RUN < /dev/null + "https://packages.nlnetlabs.nl/linux/ubuntu $(lsb_release -cs)-proposed main" \ + > /etc/apt/sources.list.d/nlnetlabs-proposed.list # Node.js (for common Actions scripts) apt-get install -y nodejs From 0f10efb7228a44e721f6822896f83710b20f5b93 Mon Sep 17 00:00:00 2001 From: Jannik Peters Date: Thu, 16 Apr 2026 09:40:43 +0200 Subject: [PATCH 09/10] Move creation of release build dnst link --- integration-tests/cascade-test-image/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/integration-tests/cascade-test-image/Dockerfile b/integration-tests/cascade-test-image/Dockerfile index a6bccdd70..5228de36d 100644 --- a/integration-tests/cascade-test-image/Dockerfile +++ b/integration-tests/cascade-test-image/Dockerfile @@ -52,6 +52,11 @@ RUN < Date: Thu, 16 Apr 2026 09:49:18 +0200 Subject: [PATCH 10/10] Mention the need to update the version in the Dockerfile --- integration-tests/cascade-test-image/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-tests/cascade-test-image/Dockerfile b/integration-tests/cascade-test-image/Dockerfile index 5228de36d..b9615e709 100644 --- a/integration-tests/cascade-test-image/Dockerfile +++ b/integration-tests/cascade-test-image/Dockerfile @@ -42,7 +42,8 @@ EOF # Provide the dnst version as a variable to make it easy to update the docker # image used by the act-wrapper to a new version of dnst. Otherwise, users will # have to manually invalidate the cached version of the RUN step below as the -# RUN step content wouldn't change. +# RUN step content wouldn't change. When a new version of dnst is published, +# we need to update these variables. ARG DNST_VERSION=0.2.0~alpha1-1noble ARG DNST_VERSION_CARGO=v0.2.0-alpha1