From 4b578aecda8062ed89a6b3c3d4e3dd78fede68ad Mon Sep 17 00:00:00 2001 From: Pavel Negrobov Date: Wed, 25 Dec 2024 09:47:43 +0300 Subject: [PATCH] inf-1573 (#13) Co-authored-by: Pavel Negrobov Reviewed-on: https://git.inferitos.ru/msvsphere/QA/pulls/13 --- files/koji_build_tag-docker.json | 12 +++++++----- files/koji_modular_tag-docker.json | 8 +++++--- files/koji_tag-docker_special.json | 5 ----- 3 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 files/koji_tag-docker_special.json diff --git a/files/koji_build_tag-docker.json b/files/koji_build_tag-docker.json index e02c9b8..aecea14 100644 --- a/files/koji_build_tag-docker.json +++ b/files/koji_build_tag-docker.json @@ -1,7 +1,9 @@ { - "inferit-8_10-*": {"docker_image_name": "msvsphere810-systemd-tests", "os_name": "MSVSphere 8.10"}, - "inferit-9_4-extras-build": {"docker_image_name": "msvsphere94-systemd-tests", "os_name": "MSVSphere 9.4"}, - "inferit-9_4-*": {"docker_image_name": "msvsphere94-systemd-tests", "os_name": "MSVSphere 9.4"}, - "inferit-9_5-extras-build": {"docker_image_name": "msvsphere95-systemd-tests", "os_name": "MSVSphere 9.5"}, - "inferit-9_5-*": {"docker_image_name": "msvsphere95-systemd-tests", "os_name": "MSVSphere 9.5"} + "inferit-8_10-*:x86_64": {"docker_image_name": "msvsphere810-systemd-tests:8.10", "os_name": "MSVSphere 8.10 (x86_64)"}, + "inferit-9_4-extras-build:x86_64": {"docker_image_name": "msvsphere94-systemd-tests:9.4", "os_name": "MSVSphere 9.4 (x86_64)"}, + "inferit-9_4-*:x86_64": {"docker_image_name": "msvsphere94-systemd-tests:9.4", "os_name": "MSVSphere 9.4 (x86_64)"}, + "inferit-9_5-extras-build:x86_64": {"docker_image_name": "msvsphere95-systemd-tests:9.5", "os_name": "MSVSphere 9.5 (x86_64)"}, + "inferit-9_5-extras-build:aarch64": {"docker_image_name": "msvsphere95-systemd-tests:9.5-arm64", "os_name": "MSVSphere 9.5 (aarch64)"}, + "inferit-9_5-*:x86_64": {"docker_image_name": "msvsphere95-systemd-tests:9.5", "os_name": "MSVSphere 9.5 (x86_64)"}, + "inferit-9_5-*:aarch64": {"docker_image_name": "msvsphere95-systemd-tests-aarch64:9.5-arm64", "os_name": "MSVSphere 9.5 (aarch64)"} } diff --git a/files/koji_modular_tag-docker.json b/files/koji_modular_tag-docker.json index 3291214..22fff12 100644 --- a/files/koji_modular_tag-docker.json +++ b/files/koji_modular_tag-docker.json @@ -1,5 +1,7 @@ { - "80900": {"docker_image_name": "msvsphere810-systemd-tests", "os_name": "MSVSphere 8.10"}, - "81000": {"docker_image_name": "msvsphere810-systemd-tests", "os_name": "MSVSphere 8.10"}, - "90400": {"docker_image_name": "msvsphere94-systemd-tests", "os_name": "MSVSphere 9.4"} + "80900:x86_64": {"docker_image_name": "msvsphere810-systemd-tests:8.10", "os_name": "MSVSphere 8.10 (x86_64)"}, + "81000:x86_64": {"docker_image_name": "msvsphere810-systemd-tests:8.10", "os_name": "MSVSphere 8.10 (x86_64)"}, + "90400:x86_64": {"docker_image_name": "msvsphere94-systemd-tests:9.4", "os_name": "MSVSphere 9.4 (x86_64)"}, + "90500:x86_64": {"docker_image_name": "msvsphere95-systemd-tests:9.5", "os_name": "MSVSphere 9.5 (x86_64)"}, + "90500:aarch64": {"docker_image_name": "msvsphere95-systemd-tests:9.5-arm64", "os_name": "MSVSphere 9.5 (aarch64)"} } diff --git a/files/koji_tag-docker_special.json b/files/koji_tag-docker_special.json deleted file mode 100644 index f1f0a97..0000000 --- a/files/koji_tag-docker_special.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "inferit-9-extras-build": {"docker_container_name": "msvsphere92-systemd-tests", "os_name": "MSVSphere 9.2"}, - "module-nodejs-20-9030020240410131601-sphere9": {"docker_container_name": "msvsphere93-systemd-tests", "os_name": "MSVSphere 9.3"}, - "module-maven-3.8-9040020240409170036-470dcefd": {"docker_container_name": "msvsphere93-systemd-tests", "os_name": "MSVSphere 9.3"} -}