From 44029145e99407c7a1d728f0fb052598a8da25cf Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Tue, 10 Sep 2024 14:15:14 -0700 Subject: [PATCH 1/4] changing name generated for marketplace iamges --- toolkit/imageconfigs/cvm.json | 2 +- toolkit/imageconfigs/marketplace-gen1-fips.json | 2 +- toolkit/imageconfigs/marketplace-gen1.json | 2 +- toolkit/imageconfigs/marketplace-gen2-aarch64.json | 2 +- toolkit/imageconfigs/marketplace-gen2-fips.json | 2 +- toolkit/imageconfigs/marketplace-gen2.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolkit/imageconfigs/cvm.json b/toolkit/imageconfigs/cvm.json index 158f3cdb4e7..93f9457097d 100644 --- a/toolkit/imageconfigs/cvm.json +++ b/toolkit/imageconfigs/cvm.json @@ -5,7 +5,7 @@ "MaxSize": 2048, "Artifacts": [ { - "Name": "cvm", + "Name": "azurelinux-gen2-cvm", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen1-fips.json b/toolkit/imageconfigs/marketplace-gen1-fips.json index 64776032631..350ffb466a7 100644 --- a/toolkit/imageconfigs/marketplace-gen1-fips.json +++ b/toolkit/imageconfigs/marketplace-gen1-fips.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "cblmariner-gen1-fips", + "Name": "azurelinux-gen1-fips", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen1.json b/toolkit/imageconfigs/marketplace-gen1.json index 802e39c7bfb..79712d3544e 100644 --- a/toolkit/imageconfigs/marketplace-gen1.json +++ b/toolkit/imageconfigs/marketplace-gen1.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "cblmariner-gen1", + "Name": "azurelinux-gen1", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen2-aarch64.json b/toolkit/imageconfigs/marketplace-gen2-aarch64.json index 650d012dcff..ac4aebc84f3 100644 --- a/toolkit/imageconfigs/marketplace-gen2-aarch64.json +++ b/toolkit/imageconfigs/marketplace-gen2-aarch64.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "cblmariner-arm64-gen2", + "Name": "azurelinux-arm64-gen2", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen2-fips.json b/toolkit/imageconfigs/marketplace-gen2-fips.json index 13155b12d59..2be81c23f00 100644 --- a/toolkit/imageconfigs/marketplace-gen2-fips.json +++ b/toolkit/imageconfigs/marketplace-gen2-fips.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "cblmariner-gen2-fips", + "Name": "azurelinux-gen2-fips", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen2.json b/toolkit/imageconfigs/marketplace-gen2.json index 92a89de3f59..948d82aabce 100644 --- a/toolkit/imageconfigs/marketplace-gen2.json +++ b/toolkit/imageconfigs/marketplace-gen2.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "cblmariner-gen2", + "Name": "azurelinux-gen2", "Type": "vhd" } ], From 4f9d58812e66f965267a7c013551b113355dcdd4 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Tue, 10 Sep 2024 14:45:56 -0700 Subject: [PATCH 2/4] rename config file --- toolkit/imageconfigs/{cvm.json => marketplace-gen2-cvm.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename toolkit/imageconfigs/{cvm.json => marketplace-gen2-cvm.json} (100%) diff --git a/toolkit/imageconfigs/cvm.json b/toolkit/imageconfigs/marketplace-gen2-cvm.json similarity index 100% rename from toolkit/imageconfigs/cvm.json rename to toolkit/imageconfigs/marketplace-gen2-cvm.json From 5ffd4296fae41952abb67d867675be94a9a1f1a4 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Tue, 29 Oct 2024 17:27:30 -0700 Subject: [PATCH 3/4] Revert "changing name generated for marketplace iamges" This reverts commit 44029145e99407c7a1d728f0fb052598a8da25cf. --- toolkit/imageconfigs/marketplace-gen1-fips.json | 2 +- toolkit/imageconfigs/marketplace-gen1.json | 2 +- toolkit/imageconfigs/marketplace-gen2-aarch64.json | 2 +- toolkit/imageconfigs/marketplace-gen2-cvm.json | 2 +- toolkit/imageconfigs/marketplace-gen2-fips.json | 2 +- toolkit/imageconfigs/marketplace-gen2.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolkit/imageconfigs/marketplace-gen1-fips.json b/toolkit/imageconfigs/marketplace-gen1-fips.json index 350ffb466a7..64776032631 100644 --- a/toolkit/imageconfigs/marketplace-gen1-fips.json +++ b/toolkit/imageconfigs/marketplace-gen1-fips.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "azurelinux-gen1-fips", + "Name": "cblmariner-gen1-fips", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen1.json b/toolkit/imageconfigs/marketplace-gen1.json index 79712d3544e..802e39c7bfb 100644 --- a/toolkit/imageconfigs/marketplace-gen1.json +++ b/toolkit/imageconfigs/marketplace-gen1.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "azurelinux-gen1", + "Name": "cblmariner-gen1", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen2-aarch64.json b/toolkit/imageconfigs/marketplace-gen2-aarch64.json index ac4aebc84f3..650d012dcff 100644 --- a/toolkit/imageconfigs/marketplace-gen2-aarch64.json +++ b/toolkit/imageconfigs/marketplace-gen2-aarch64.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "azurelinux-arm64-gen2", + "Name": "cblmariner-arm64-gen2", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen2-cvm.json b/toolkit/imageconfigs/marketplace-gen2-cvm.json index 93f9457097d..158f3cdb4e7 100644 --- a/toolkit/imageconfigs/marketplace-gen2-cvm.json +++ b/toolkit/imageconfigs/marketplace-gen2-cvm.json @@ -5,7 +5,7 @@ "MaxSize": 2048, "Artifacts": [ { - "Name": "azurelinux-gen2-cvm", + "Name": "cvm", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen2-fips.json b/toolkit/imageconfigs/marketplace-gen2-fips.json index 2be81c23f00..13155b12d59 100644 --- a/toolkit/imageconfigs/marketplace-gen2-fips.json +++ b/toolkit/imageconfigs/marketplace-gen2-fips.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "azurelinux-gen2-fips", + "Name": "cblmariner-gen2-fips", "Type": "vhd" } ], diff --git a/toolkit/imageconfigs/marketplace-gen2.json b/toolkit/imageconfigs/marketplace-gen2.json index 948d82aabce..92a89de3f59 100644 --- a/toolkit/imageconfigs/marketplace-gen2.json +++ b/toolkit/imageconfigs/marketplace-gen2.json @@ -5,7 +5,7 @@ "MaxSize": 5000, "Artifacts": [ { - "Name": "azurelinux-gen2", + "Name": "cblmariner-gen2", "Type": "vhd" } ], From 6692d70ef675b2b295dfec0bb68d7cb3ae8344ce Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Tue, 29 Oct 2024 17:28:19 -0700 Subject: [PATCH 4/4] name cvm image more descriptive --- toolkit/imageconfigs/marketplace-gen2-cvm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/imageconfigs/marketplace-gen2-cvm.json b/toolkit/imageconfigs/marketplace-gen2-cvm.json index 158f3cdb4e7..094c7d44bdb 100644 --- a/toolkit/imageconfigs/marketplace-gen2-cvm.json +++ b/toolkit/imageconfigs/marketplace-gen2-cvm.json @@ -5,7 +5,7 @@ "MaxSize": 2048, "Artifacts": [ { - "Name": "cvm", + "Name": "cblmariner-gen2-cvm", "Type": "vhd" } ],