Update test data

The parts in multi compose are now named reasonably.

The package set repos are selected only once and not per variant. We
can't use repos with packages for specific arch only as that would
require more transformations during generating test data.

Lookasides for ResilientStorage part are added to point to Server part.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

tests/data/client.conf

@@ -1,14 +1,10 @@
 from dummy-pungi import *
 
+release_short = "Client"
+
 tree_variants = ["Client"]
 pkgset_repos = {
-    "i386": [
+    "*": [
-        "{{configdir}}/repo",
-    ],
-    "x86_64": [
-        "{{configdir}}/repo",
-    ],
-    "s390x": [
         "{{configdir}}/repo",
     ],
 }

tests/data/dummy-pungi.conf

@@ -19,13 +19,7 @@ runroot = False
 sigkeys = [None]
 pkgset_source = "repos"
 pkgset_repos = {
-    "i386": [
+    "*": [
-        "repo",
-    ],
-    "x86_64": [
-        "repo",
-    ],
-    "s390x": [
         "repo",
     ],
 }

tests/data/resilient-storage.conf

@@ -1,15 +1,19 @@
 from dummy-pungi import *
 
+release_short = "ResilientStorage"
+
 tree_variants = ["ResilientStorage"]
 variants_file = "multi-compose-variants.xml"
 pkgset_repos = {
-    "i386": [
+    "*": [
-        "{{configdir}}/repo",
+        "{{configdir}}/repo/",
-    ],
-    "x86_64": [
-        "{{configdir}}/repo",
-    ],
-    "s390x": [
-        "{{configdir}}/repo",
     ],
 }
+gather_lookaside_repos = [
+    ('^ResilientStorage$', {
+        '*': [
+            "{{part-server}}/compose/Server/$basearch/os",
+            "{{part-server}}/compose/Server/source/tree",
+        ]
+    })
+]

tests/data/server.conf

@@ -1,15 +1,11 @@
 from dummy-pungi import *
 
+release_short = "Server"
+
 tree_variants = ["Server"]
 variants_file = "multi-compose-variants.xml"
 pkgset_repos = {
-    "i386": [
+    "*": [
-        "{{configdir}}/repo",
-    ],
-    "x86_64": [
-        "{{configdir}}/repo",
-    ],
-    "s390x": [
         "{{configdir}}/repo",
     ],
 }