Skip to content

[integration-tests] Limit Cascade queries to SOA/XFR #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bal-e merged 1 commit into from
Apr 7, 2026
Merged

[integration-tests] Limit Cascade queries to SOA/XFR #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/actions/print-logfiles/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ runs:
steps:
- name: Print all the nameserver log files
run: |
for i in ${{ inputs.nameserver-dir }}/*.log; do
for i in ${{ github.workspace }}/*.log ${{ inputs.nameserver-dir }}/*.log; do
echo ">>> Logfile $i:" >&2
cat "$i" >&2 || true
done
echo ">>> Logfile cascade-startup.log:" >&2
cat "${{ inputs.cascade-dir }}/cascade-startup.log" >&2 || true
echo ">>> Logfile cascade.log:" >&2
cat "${{ inputs.cascade-dir }}//cascade.log" >&2 || true
cat "${{ inputs.cascade-dir }}/cascade.log" >&2 || true

@tertsdiepraam tertsdiepraam Apr 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this broken or is it just a slight improvement?

@bal-e bal-e Apr 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a slight improvement.

echo ">>> Config cascade:" >&2
cat "${{ inputs.cascade-dir }}//config.toml" >&2 || true
cat "${{ inputs.cascade-dir }}/config.toml" >&2 || true
echo ">>> Logfile manage-test-environment.log:" >&2
cat "manage-test-environment.log" >&2 || true
echo ">>> Config resolv.conf:" >&2
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/tests/add-zone-query/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:
done
- name: Query zone
run: |
dig @127.0.0.1 -p 4542 example.test AXFR
dig @127.0.0.1 -p 4542 example.test AXFR > dig-query.log

@tertsdiepraam tertsdiepraam Apr 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this for debugging?

@bal-e bal-e Apr 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It removes the output from act-wrapper's overall stdout, and puts it in a place that it will still get printed on failure. Just a minor improvement.

- name: Tell the NSD secondary that the zone is now available
# Only necessary if NOTIFY is not setup for cascade
run: |
Expand Down
15 changes: 5 additions & 10 deletions integration-tests/tests/ixfr-in/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ runs:
SOA_RR=$(dig +short @127.0.0.1 -p 4540 example.test SOA)
if [[ "${SOA_RR}" != "ns1.example.test. mail.example.test. 1 60 60 3600 5" ]]; then
echo "::error:: Expected SOA serial '1' but dig reports '${SOA_RR}'"
dig @127.0.0.1 -p 4540 example.test AXFR

@tertsdiepraam tertsdiepraam Apr 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't expect this PR to add more dig commands?

exit 1
fi

Expand Down Expand Up @@ -194,16 +195,10 @@ runs:

- name: Query changed RRs at Cascade publication server
run: |
WWW_A_RR=$(dig +short @127.0.0.1 -p 4542 www.example.test A)
if [[ "${WWW_A_RR}" != "192.168.0.1" ]]; then
echo "::error:: Expected modified RR but dig reports '${WWW_A_RR}'"
exit 1
fi
MAIL_MX_RR=$(dig +short @127.0.0.1 -p 4542 mail.example.test MX)
if [[ "${MAIL_MX_RR}" != "20 example.test." ]]; then
echo "::error:: Expected modified RR but dig reports '${MAIL_MX_RR}'"
exit 1
fi
# https://askubuntu.com/a/1232402
dig @127.0.0.1 -p 4542 example.test AXFR | tr -s '[:blank:]' ',' > dig-query.log
grep -qF "www.example.test.,5,IN,A,192.168.0.1" dig-query.log
grep -qF "mail.example.test.,5,IN,MX,20,example.test." dig-query.log

- name: Print log files on any failure in this job
uses: ./.github/actions/print-logfiles
Expand Down