Skip to content

Commit

Permalink
[9.18] fix: ci: Add ns2/managed1.conf to mkeys extra_artifacts
Browse files Browse the repository at this point in the history
The ns2/managed1.conf file is created by the setup.sh script. Then, in
the tests.sh script it is moved to ns2/managed.conf. The latter file
name is in mkeys extra_artifacts, but the former one is not. This is a
problem when pytest is started with the --setup-only option as it only
runs the setup.sh script (e.g., in the cross-version-config-tests CI
job) and thus failing the "Unexpected files found" assertion.

Backport of MR !9815

Merge branch 'backport-mnowak/mkeys-add-ns2-managed1-conf-to-extra-artifacts-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!9825
  • Loading branch information
Mno-hime committed Dec 5, 2024
2 parents 1d4e60c + 2f093e7 commit 55475d9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions bin/tests/system/mkeys/tests_sh_mkeys.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"ns1/root.db.tmp",
"ns1/zone.key",
"ns2/managed-keys.bind",
"ns2/managed1.conf",
"ns3/broken.conf",
"ns3/managed-keys.bind",
"ns4/nope",
Expand Down

0 comments on commit 55475d9

Please sign in to comment.