Add rr-related common test artifacts

(cherry picked from commit c607237b77f6cb56b51195f37685b83c73487fb6)

diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py
index 37a26bb5496a44a4707dade6633537c860f98d41..06cae48cad956cdbc2bcf6a7ee0f7c143fda65ec 100644 (file)
--- a/bin/tests/system/conftest.py
+++ b/bin/tests/system/conftest.py
@@ -358,14 +358,21 @@ def logger(request, system_test_name):
 def expected_artifacts(request):
     common_artifacts = [
         ".libs/*",  # possible build artifacts, see GL #5055
+        "ns*/named.conf",
         "ns*/named.lock",
+        "ns*/named.memstats",
         "ns*/named.run",
         "ns*/named.run.prev",
-        "ns*/named.conf",
-        "ns*/named.memstats",
         "pytest.log.txt",
     ]
 
+    if "USE_RR" in os.environ:
+        common_artifacts += [
+            "ns*/cpu_lock",
+            "ns*/latest-trace",
+            "ns*/named-[0-9]*",
+        ]
+
     try:
         test_specific_artifacts = request.node.get_closest_marker("extra_artifacts")
     except AttributeError: