cleanup: master.cfg simplify worker name suffix/prefix construction

No logic changes, just reorder the code to make it shorter.

master.cfg

@@ -74,8 +74,7 @@ for w_name in master_config["workers"]:
 
     for arch in master_config["builders"]:
         builders = master_config["builders"][arch]
-        for os_name in builders:
-            os_definition = builders[os_name]
+        for os_name, os_definition in builders.items():
             image_tag = os_definition['image_tag']
 
             # Skip s390x non-SLES builders on SLES host (bbw2)
@@ -111,26 +110,17 @@ f_deb_autobake = getDebAutobakeFactory()
 
 
 ####### BUILDERS LIST
-
 c["builders"] = []
 
 for arch in master_config["builders"]:
+    worker_prefix = "x64" if arch in ["amd64", "x86"] else arch
+    worker_suffix = "-i386" if arch == "x86" else ""
+
     builders_group = master_config["builders"][arch]
     for os_name in builders_group:
-        worker_prefix = arch
-        worker_suffix = ''
-
-        if arch == "amd64":
-            worker_prefix = "x64"
-
-        if arch == "x86":
-            worker_prefix = 'x64'
-            worker_suffix = '-i386'
         worker_name = f'{worker_prefix}-bbw-docker-{os_name}{worker_suffix}'
-
-        build_type = OS_INFO[os_name]["type"]
-
         builder = f'{arch}-{os_name}'
+        build_type = OS_INFO[os_name]["type"]
 
         tags = [os_name]
         # Add builder only if it's not a protected branches one

os_info.yaml

@@ -104,7 +104,7 @@ opensuse-1506:
   tags:
     - release_packages
     - bleeding_edge
-  version_name: 156
+  version_name: 15
   arch:
     - amd64
   type: rpm