From 50739e5ce9afe672e40b782410b15b5660b6b222 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Tue, 29 Nov 2022 17:58:04 +0800 Subject: [PATCH] Fix version file name path suffix issue. (#12861) --- .../versions-deb-bullseye | 0 .../versions-deb-bullseye-armhf | 0 .../versions-py3 | 0 .../versions-deb-buster | 0 .../{docker-base-buster-sonic => docker-base-buster}/versions-py3 | 0 .../{docker-base-buster-sonic => docker-base-buster}/versions-web | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye-armhf | 0 .../versions-py3 | 0 .../versions-deb-buster | 0 .../versions-deb-buster-armhf | 0 .../versions-py3 | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye | 0 .../dockers/{docker-fpm-frr-sonic => docker-fpm-frr}/versions-py3 | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye | 0 .../{docker-lldp-sonic => docker-lldp}/versions-deb-bullseye | 0 .../{docker-macsec-sonic => docker-macsec}/versions-deb-bullseye | 0 .../{docker-mux-sonic => docker-mux}/versions-deb-bullseye | 0 .../dockers/{docker-nat-sonic => docker-nat}/versions-deb-buster | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye-armhf | 0 .../{docker-orchagent-sonic => docker-orchagent}/versions-py3 | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye-armhf | 0 .../versions-py3 | 0 .../{docker-ptf-sai-sonic => docker-ptf-sai}/versions-deb-buster | 0 .../dockers/{docker-ptf-sai-sonic => docker-ptf-sai}/versions-py3 | 0 .../dockers/{docker-ptf-sonic => docker-ptf}/versions-deb-buster | 0 .../dockers/{docker-ptf-sonic => docker-ptf}/versions-py2 | 0 .../dockers/{docker-ptf-sonic => docker-ptf}/versions-py3 | 0 .../versions-deb-bullseye | 0 .../{docker-sflow-sonic => docker-sflow}/versions-deb-buster | 0 .../{docker-snmp-sonic => docker-snmp}/versions-deb-bullseye | 0 .../versions-deb-bullseye-armhf | 0 .../dockers/{docker-snmp-sonic => docker-snmp}/versions-py3 | 0 .../versions-deb-buster | 0 .../versions-deb-buster-armhf | 0 .../versions-py3 | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye | 0 .../versions-deb-buster | 0 .../{docker-sonic-vs-sonic => docker-sonic-vs}/versions-py2 | 0 .../{docker-sonic-vs-sonic => docker-sonic-vs}/versions-py3 | 0 .../versions-deb-bullseye | 0 .../versions-deb-buster | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye | 0 .../versions-web | 0 .../versions-deb-bullseye | 0 .../versions-deb-bullseye | 0 .../versions-web | 0 .../versions-deb-bullseye | 0 .../versions-deb-buster | 0 .../versions-py2 | 0 .../versions-deb-buster | 0 .../versions-deb-bullseye | 0 .../versions-py2 | 0 .../versions-deb-bullseye | 0 .../{docker-syncd-mlnx-sonic => docker-syncd-mlnx}/versions-py3 | 0 .../versions-deb-bullseye-armhf | 0 .../versions-deb-buster | 0 .../{docker-teamd-sonic => docker-teamd}/versions-deb-bullseye | 0 67 files changed, 0 insertions(+), 0 deletions(-) rename files/build/versions/dockers/{docker-base-bullseye-sonic => docker-base-bullseye}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-base-bullseye-sonic => docker-base-bullseye}/versions-deb-bullseye-armhf (100%) rename files/build/versions/dockers/{docker-base-bullseye-sonic => docker-base-bullseye}/versions-py3 (100%) rename files/build/versions/dockers/{docker-base-buster-sonic => docker-base-buster}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-base-buster-sonic => docker-base-buster}/versions-py3 (100%) rename files/build/versions/dockers/{docker-base-buster-sonic => docker-base-buster}/versions-web (100%) rename files/build/versions/dockers/{docker-config-engine-bullseye-sonic => docker-config-engine-bullseye}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-config-engine-bullseye-sonic => docker-config-engine-bullseye}/versions-deb-bullseye-armhf (100%) rename files/build/versions/dockers/{docker-config-engine-bullseye-sonic => docker-config-engine-bullseye}/versions-py3 (100%) rename files/build/versions/dockers/{docker-config-engine-buster-sonic => docker-config-engine-buster}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-config-engine-buster-sonic => docker-config-engine-buster}/versions-deb-buster-armhf (100%) rename files/build/versions/dockers/{docker-config-engine-buster-sonic => docker-config-engine-buster}/versions-py3 (100%) rename files/build/versions/dockers/{docker-database-sonic => docker-database}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-dhcp-relay-sonic => docker-dhcp-relay}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-fpm-frr-sonic => docker-fpm-frr}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-fpm-frr-sonic => docker-fpm-frr}/versions-py3 (100%) rename files/build/versions/dockers/{docker-gbsyncd-broncos-sonic => docker-gbsyncd-broncos}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-gbsyncd-credo-sonic => docker-gbsyncd-credo}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-gbsyncd-vs-sonic => docker-gbsyncd-vs}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-lldp-sonic => docker-lldp}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-macsec-sonic => docker-macsec}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-mux-sonic => docker-mux}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-nat-sonic => docker-nat}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-orchagent-sonic => docker-orchagent}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-orchagent-sonic => docker-orchagent}/versions-deb-bullseye-armhf (100%) rename files/build/versions/dockers/{docker-orchagent-sonic => docker-orchagent}/versions-py3 (100%) rename files/build/versions/dockers/{docker-platform-monitor-sonic => docker-platform-monitor}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-platform-monitor-sonic => docker-platform-monitor}/versions-deb-bullseye-armhf (100%) rename files/build/versions/dockers/{docker-platform-monitor-sonic => docker-platform-monitor}/versions-py3 (100%) rename files/build/versions/dockers/{docker-ptf-sai-sonic => docker-ptf-sai}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-ptf-sai-sonic => docker-ptf-sai}/versions-py3 (100%) rename files/build/versions/dockers/{docker-ptf-sonic => docker-ptf}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-ptf-sonic => docker-ptf}/versions-py2 (100%) rename files/build/versions/dockers/{docker-ptf-sonic => docker-ptf}/versions-py3 (100%) rename files/build/versions/dockers/{docker-router-advertiser-sonic => docker-router-advertiser}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-sflow-sonic => docker-sflow}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-snmp-sonic => docker-snmp}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-snmp-sonic => docker-snmp}/versions-deb-bullseye-armhf (100%) rename files/build/versions/dockers/{docker-snmp-sonic => docker-snmp}/versions-py3 (100%) rename files/build/versions/dockers/{docker-sonic-mgmt-framework-sonic => docker-sonic-mgmt-framework}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-sonic-mgmt-framework-sonic => docker-sonic-mgmt-framework}/versions-deb-buster-armhf (100%) rename files/build/versions/dockers/{docker-sonic-mgmt-framework-sonic => docker-sonic-mgmt-framework}/versions-py3 (100%) rename files/build/versions/dockers/{docker-sonic-p4rt-sonic => docker-sonic-p4rt}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-sonic-telemetry-sonic => docker-sonic-telemetry}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-sonic-vs-sonic => docker-sonic-vs}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-sonic-vs-sonic => docker-sonic-vs}/versions-py2 (100%) rename files/build/versions/dockers/{docker-sonic-vs-sonic => docker-sonic-vs}/versions-py3 (100%) rename files/build/versions/dockers/{docker-swss-layer-bullseye-sonic => docker-swss-layer-bullseye}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-swss-layer-buster-sonic => docker-swss-layer-buster}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-syncd-bfn-rpc-sonic => docker-syncd-bfn-rpc}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-syncd-bfn-sonic => docker-syncd-bfn}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-syncd-brcm-dnx-rpc-sonic => docker-syncd-brcm-dnx-rpc}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-syncd-brcm-dnx-rpc-sonic => docker-syncd-brcm-dnx-rpc}/versions-web (100%) rename files/build/versions/dockers/{docker-syncd-brcm-dnx-sonic => docker-syncd-brcm-dnx}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-syncd-brcm-rpc-sonic => docker-syncd-brcm-rpc}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-syncd-brcm-rpc-sonic => docker-syncd-brcm-rpc}/versions-web (100%) rename files/build/versions/dockers/{docker-syncd-brcm-sonic => docker-syncd-brcm}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-syncd-centec-rpc-sonic => docker-syncd-centec-rpc}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-syncd-centec-rpc-sonic => docker-syncd-centec-rpc}/versions-py2 (100%) rename files/build/versions/dockers/{docker-syncd-centec-sonic => docker-syncd-centec}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-syncd-mlnx-rpc-sonic => docker-syncd-mlnx-rpc}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-syncd-mlnx-rpc-sonic => docker-syncd-mlnx-rpc}/versions-py2 (100%) rename files/build/versions/dockers/{docker-syncd-mlnx-sonic => docker-syncd-mlnx}/versions-deb-bullseye (100%) rename files/build/versions/dockers/{docker-syncd-mlnx-sonic => docker-syncd-mlnx}/versions-py3 (100%) rename files/build/versions/dockers/{docker-syncd-mrvl-sonic => docker-syncd-mrvl}/versions-deb-bullseye-armhf (100%) rename files/build/versions/dockers/{docker-syncd-vs-sonic => docker-syncd-vs}/versions-deb-buster (100%) rename files/build/versions/dockers/{docker-teamd-sonic => docker-teamd}/versions-deb-bullseye (100%) diff --git a/files/build/versions/dockers/docker-base-bullseye-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-base-bullseye-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-base-bullseye-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye-armhf similarity index 100% rename from files/build/versions/dockers/docker-base-bullseye-sonic/versions-deb-bullseye-armhf rename to files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye-armhf diff --git a/files/build/versions/dockers/docker-base-bullseye-sonic/versions-py3 b/files/build/versions/dockers/docker-base-bullseye/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-base-bullseye-sonic/versions-py3 rename to files/build/versions/dockers/docker-base-bullseye/versions-py3 diff --git a/files/build/versions/dockers/docker-base-buster-sonic/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-base-buster-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-base-buster/versions-deb-buster diff --git a/files/build/versions/dockers/docker-base-buster-sonic/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-base-buster-sonic/versions-py3 rename to files/build/versions/dockers/docker-base-buster/versions-py3 diff --git a/files/build/versions/dockers/docker-base-buster-sonic/versions-web b/files/build/versions/dockers/docker-base-buster/versions-web similarity index 100% rename from files/build/versions/dockers/docker-base-buster-sonic/versions-web rename to files/build/versions/dockers/docker-base-buster/versions-web diff --git a/files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-armhf similarity index 100% rename from files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-deb-bullseye-armhf rename to files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-armhf diff --git a/files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-py3 b/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-config-engine-bullseye-sonic/versions-py3 rename to files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 diff --git a/files/build/versions/dockers/docker-config-engine-buster-sonic/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-config-engine-buster-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster diff --git a/files/build/versions/dockers/docker-config-engine-buster-sonic/versions-deb-buster-armhf b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf similarity index 100% rename from files/build/versions/dockers/docker-config-engine-buster-sonic/versions-deb-buster-armhf rename to files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster-armhf diff --git a/files/build/versions/dockers/docker-config-engine-buster-sonic/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-config-engine-buster-sonic/versions-py3 rename to files/build/versions/dockers/docker-config-engine-buster/versions-py3 diff --git a/files/build/versions/dockers/docker-database-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-database/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-database-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-database/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-dhcp-relay-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-dhcp-relay-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-fpm-frr-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-fpm-frr-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-fpm-frr-sonic/versions-py3 b/files/build/versions/dockers/docker-fpm-frr/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-fpm-frr-sonic/versions-py3 rename to files/build/versions/dockers/docker-fpm-frr/versions-py3 diff --git a/files/build/versions/dockers/docker-gbsyncd-broncos-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-gbsyncd-broncos-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-gbsyncd-credo-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-gbsyncd-credo-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-gbsyncd-vs-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-gbsyncd-vs-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-lldp-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-lldp/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-lldp-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-lldp/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-macsec-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-macsec/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-macsec-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-macsec/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-mux-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-mux/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-mux-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-mux/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-nat-sonic/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-nat-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-nat/versions-deb-buster diff --git a/files/build/versions/dockers/docker-orchagent-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-orchagent-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-orchagent/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-orchagent-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye-armhf similarity index 100% rename from files/build/versions/dockers/docker-orchagent-sonic/versions-deb-bullseye-armhf rename to files/build/versions/dockers/docker-orchagent/versions-deb-bullseye-armhf diff --git a/files/build/versions/dockers/docker-orchagent-sonic/versions-py3 b/files/build/versions/dockers/docker-orchagent/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-orchagent-sonic/versions-py3 rename to files/build/versions/dockers/docker-orchagent/versions-py3 diff --git a/files/build/versions/dockers/docker-platform-monitor-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-platform-monitor-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-platform-monitor-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye-armhf similarity index 100% rename from files/build/versions/dockers/docker-platform-monitor-sonic/versions-deb-bullseye-armhf rename to files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye-armhf diff --git a/files/build/versions/dockers/docker-platform-monitor-sonic/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-platform-monitor-sonic/versions-py3 rename to files/build/versions/dockers/docker-platform-monitor/versions-py3 diff --git a/files/build/versions/dockers/docker-ptf-sai-sonic/versions-deb-buster b/files/build/versions/dockers/docker-ptf-sai/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-ptf-sai-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-ptf-sai/versions-deb-buster diff --git a/files/build/versions/dockers/docker-ptf-sai-sonic/versions-py3 b/files/build/versions/dockers/docker-ptf-sai/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-ptf-sai-sonic/versions-py3 rename to files/build/versions/dockers/docker-ptf-sai/versions-py3 diff --git a/files/build/versions/dockers/docker-ptf-sonic/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-ptf-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-ptf/versions-deb-buster diff --git a/files/build/versions/dockers/docker-ptf-sonic/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2 similarity index 100% rename from files/build/versions/dockers/docker-ptf-sonic/versions-py2 rename to files/build/versions/dockers/docker-ptf/versions-py2 diff --git a/files/build/versions/dockers/docker-ptf-sonic/versions-py3 b/files/build/versions/dockers/docker-ptf/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-ptf-sonic/versions-py3 rename to files/build/versions/dockers/docker-ptf/versions-py3 diff --git a/files/build/versions/dockers/docker-router-advertiser-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-router-advertiser-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-sflow-sonic/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-sflow-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-sflow/versions-deb-buster diff --git a/files/build/versions/dockers/docker-snmp-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-snmp-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-snmp/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-snmp-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye-armhf similarity index 100% rename from files/build/versions/dockers/docker-snmp-sonic/versions-deb-bullseye-armhf rename to files/build/versions/dockers/docker-snmp/versions-deb-bullseye-armhf diff --git a/files/build/versions/dockers/docker-snmp-sonic/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-snmp-sonic/versions-py3 rename to files/build/versions/dockers/docker-snmp/versions-py3 diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-deb-buster-armhf b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-armhf similarity index 100% rename from files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-deb-buster-armhf rename to files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster-armhf diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-sonic-mgmt-framework-sonic/versions-py3 rename to files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 diff --git a/files/build/versions/dockers/docker-sonic-p4rt-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-sonic-p4rt/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-sonic-p4rt-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-sonic-p4rt/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-sonic-telemetry-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-sonic-telemetry-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-sonic-vs-sonic/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-sonic-vs-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-sonic-vs/versions-deb-buster diff --git a/files/build/versions/dockers/docker-sonic-vs-sonic/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2 similarity index 100% rename from files/build/versions/dockers/docker-sonic-vs-sonic/versions-py2 rename to files/build/versions/dockers/docker-sonic-vs/versions-py2 diff --git a/files/build/versions/dockers/docker-sonic-vs-sonic/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-sonic-vs-sonic/versions-py3 rename to files/build/versions/dockers/docker-sonic-vs/versions-py3 diff --git a/files/build/versions/dockers/docker-swss-layer-bullseye-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-swss-layer-bullseye/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-swss-layer-bullseye-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-swss-layer-bullseye/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-swss-layer-buster-sonic/versions-deb-buster b/files/build/versions/dockers/docker-swss-layer-buster/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-swss-layer-buster-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-swss-layer-buster/versions-deb-buster diff --git a/files/build/versions/dockers/docker-syncd-bfn-rpc-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-syncd-bfn-rpc-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-syncd-bfn-rpc/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-syncd-bfn-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-syncd-bfn-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-syncd-bfn/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-syncd-brcm-dnx-rpc-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc-sonic/versions-web b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-web similarity index 100% rename from files/build/versions/dockers/docker-syncd-brcm-dnx-rpc-sonic/versions-web rename to files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-web diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-syncd-brcm-dnx-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-syncd-brcm-rpc-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc-sonic/versions-web b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web similarity index 100% rename from files/build/versions/dockers/docker-syncd-brcm-rpc-sonic/versions-web rename to files/build/versions/dockers/docker-syncd-brcm-rpc/versions-web diff --git a/files/build/versions/dockers/docker-syncd-brcm-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-syncd-brcm-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc-sonic/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-syncd-centec-rpc-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc-sonic/versions-py2 b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 similarity index 100% rename from files/build/versions/dockers/docker-syncd-centec-rpc-sonic/versions-py2 rename to files/build/versions/dockers/docker-syncd-centec-rpc/versions-py2 diff --git a/files/build/versions/dockers/docker-syncd-centec-sonic/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-syncd-centec-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-syncd-centec/versions-deb-buster diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-syncd-mlnx-rpc-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc-sonic/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2 similarity index 100% rename from files/build/versions/dockers/docker-syncd-mlnx-rpc-sonic/versions-py2 rename to files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-py2 diff --git a/files/build/versions/dockers/docker-syncd-mlnx-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-syncd-mlnx-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye diff --git a/files/build/versions/dockers/docker-syncd-mlnx-sonic/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 similarity index 100% rename from files/build/versions/dockers/docker-syncd-mlnx-sonic/versions-py3 rename to files/build/versions/dockers/docker-syncd-mlnx/versions-py3 diff --git a/files/build/versions/dockers/docker-syncd-mrvl-sonic/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf similarity index 100% rename from files/build/versions/dockers/docker-syncd-mrvl-sonic/versions-deb-bullseye-armhf rename to files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf diff --git a/files/build/versions/dockers/docker-syncd-vs-sonic/versions-deb-buster b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster similarity index 100% rename from files/build/versions/dockers/docker-syncd-vs-sonic/versions-deb-buster rename to files/build/versions/dockers/docker-syncd-vs/versions-deb-buster diff --git a/files/build/versions/dockers/docker-teamd-sonic/versions-deb-bullseye b/files/build/versions/dockers/docker-teamd/versions-deb-bullseye similarity index 100% rename from files/build/versions/dockers/docker-teamd-sonic/versions-deb-bullseye rename to files/build/versions/dockers/docker-teamd/versions-deb-bullseye