ci: update Deckard to a version without swrap

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0987548ec57823a0d70f3d0c0dbd7a711c419030..f87d9e9416afc41de01571f77a70bc04095b7a62 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,6 +168,8 @@ build:darwin:
 
 deckard:
   <<: *test_flaky
+  tags:
+    - privileged
   variables:
     TMPDIR: $CI_PROJECT_DIR
   script:

diff --git a/modules/view/addr.test.integr/kresd_config.j2 b/modules/view/addr.test.integr/kresd_config.j2
index f63e01cda4f3757dc20d23e4bffba691db1ad14f..14edc1a96cea838ecf51be8a37274df4fec49fce 100644 (file)
--- a/modules/view/addr.test.integr/kresd_config.j2
+++ b/modules/view/addr.test.integr/kresd_config.j2
@@ -2,8 +2,8 @@
 {% raw %}
 modules.load('view < policy')
 
-view:addr('127.0.0.0/24', policy.suffix(policy.DENY_MSG("addr 127.0.0.0/24 matched com"),{"\3com\0"}))
-view:addr('127.0.0.0/24', policy.suffix(policy.DENY_MSG("addr 127.0.0.0/24 matched net"),{"\3net\0"}))
+view:addr('127.127.0.0/16', policy.suffix(policy.DENY_MSG("addr 127.127.0.0/16 matched com"),{"\3com\0"}))
+view:addr('127.127.0.0/16', policy.suffix(policy.DENY_MSG("addr 127.127.0.0/16 matched net"),{"\3net\0"}))
 policy.add(policy.all(policy.FORWARD('1.2.3.4')))
 
 -- make sure DNSSEC is turned off for tests

diff --git a/modules/view/addr.test.integr/module_view_addr.rpl b/modules/view/addr.test.integr/module_view_addr.rpl
index 6a2f926aca549e18476ae355cc270fc6ef4199e2..f9370da95ff9ffdb617158bc8c38930c8a0262f7 100644 (file)
--- a/modules/view/addr.test.integr/module_view_addr.rpl
+++ b/modules/view/addr.test.integr/module_view_addr.rpl
@@ -54,7 +54,7 @@ REPLY QR RD RA AA NXDOMAIN
 SECTION QUESTION
 example.com. IN A
 SECTION ADDITIONAL
-explanation.invalid. 10800 IN TXT "addr 127.0.0.0/24 matched com"
+explanation.invalid. 10800 IN TXT "addr 127.127.0.0/16 matched com"
 ENTRY_END
 
 ; blocked by view:addr + inner policy.suffix net
@@ -73,7 +73,7 @@ REPLY QR RD RA AA NXDOMAIN
 SECTION QUESTION
 example.net. IN A
 SECTION ADDITIONAL
-explanation.invalid. 10800 IN TXT "addr 127.0.0.0/24 matched net"
+explanation.invalid. 10800 IN TXT "addr 127.127.0.0/16 matched net"
 ENTRY_END
 
 SCENARIO_END

diff --git a/tests/integration/deckard b/tests/integration/deckard
index 10c982a4fb2086c6b5e98d280fa57a652c66d7fa..ed0a316cfd1bbcb0f8697e5860b3409fcde52dde 160000 (submodule)
--- a/tests/integration/deckard
+++ b/tests/integration/deckard
@@ -1 +1 @@
-Subproject commit 10c982a4fb2086c6b5e98d280fa57a652c66d7fa
+Subproject commit ed0a316cfd1bbcb0f8697e5860b3409fcde52dde