From aba1cf6c23a0fba6630e54adea0e75649ca5d6bd Mon Sep 17 00:00:00 2001 From: Pavel Negrobov Date: Sun, 15 Dec 2024 16:22:52 +0300 Subject: [PATCH 1/3] =?UTF-8?q?INF-1573:=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=20=D0=B4=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=B8=D0=BD=D1=81=D0=B5=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D0=BA=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=20RPM=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20aarch64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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..767708c 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: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..4e24872 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": "msvsphere94-systemd-tests:9.5", "os_name": "MSVSphere 9.5 (x86_64)"}, + "90500:aarch64": {"docker_image_name": "msvsphere94-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"} -} -- 2.36.5 From 89b725a8915a6e6a735ce7c009bac95d3aedc2f7 Mon Sep 17 00:00:00 2001 From: Pavel Negrobov Date: Mon, 16 Dec 2024 12:09:51 +0300 Subject: [PATCH 2/3] =?UTF-8?q?INF-1573:=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=20=D0=B4=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=B8=D0=BD=D1=81=D0=B5=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D0=BA=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=20RPM=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20aarch64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/koji_build_tag-docker.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/koji_build_tag-docker.json b/files/koji_build_tag-docker.json index 767708c..aecea14 100644 --- a/files/koji_build_tag-docker.json +++ b/files/koji_build_tag-docker.json @@ -5,5 +5,5 @@ "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:9.5-arm64", "os_name": "MSVSphere 9.5 (aarch64)"} + "inferit-9_5-*:aarch64": {"docker_image_name": "msvsphere95-systemd-tests-aarch64:9.5-arm64", "os_name": "MSVSphere 9.5 (aarch64)"} } -- 2.36.5 From 72dc043c33e088b9268a6fc982b2cd44a0f68184 Mon Sep 17 00:00:00 2001 From: Pavel Negrobov Date: Tue, 24 Dec 2024 20:34:15 +0300 Subject: [PATCH 3/3] =?UTF-8?q?INF-1573:=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=20=D0=B4=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=B8=D0=BD=D1=81=D0=B5=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D0=BA=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=20RPM=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20aarch64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/koji_modular_tag-docker.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/koji_modular_tag-docker.json b/files/koji_modular_tag-docker.json index 4e24872..22fff12 100644 --- a/files/koji_modular_tag-docker.json +++ b/files/koji_modular_tag-docker.json @@ -2,6 +2,6 @@ "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": "msvsphere94-systemd-tests:9.5", "os_name": "MSVSphere 9.5 (x86_64)"}, - "90500:aarch64": {"docker_image_name": "msvsphere94-systemd-tests:9.5-arm64", "os_name": "MSVSphere 9.5 (aarch64)"} + "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)"} } -- 2.36.5