fix: update client version in e2e testing (#3755)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Jan 9, 2025 · 25a4b53 · 25a4b53
1 parent e5d3ede
commit 25a4b53
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 61 deletions.
diff --git a/.github/workflows/compatibility-e2e-v2.yml b/.github/workflows/compatibility-e2e-v2.yml
@@ -39,11 +39,11 @@ jobs:
             chart-name: scheduler
           - module: client
             image: client
-            image-tag: v0.1.125
+            image-tag: v0.2.4
             chart-name: client
           - module: seed-client
             image: client
-            image-tag: v0.1.125
+            image-tag: v0.2.4
             chart-name: seed-client
 
     steps:

diff --git a/client-rs b/client-rs
diff --git a/test/e2e/v2/containerd_test.go b/test/e2e/v2/containerd_test.go
@@ -27,35 +27,35 @@ import (
 )
 
 var _ = Describe("Containerd with CRI support", func() {
-	Context("dragonflyoss/manager:v2.0.0 image", func() {
+	Context("ghcr.io/dragonflyoss/manager:v2.1.0 image", func() {
 		It("pull should be ok", Label("containerd", "pull"), func() {
-			out, err := util.CriCtlCommand("pull", "dragonflyoss/manager:v2.1.0").CombinedOutput()
+			out, err := util.CriCtlCommand("pull", "ghcr.io/dragonflyoss/manager:v2.1.0").CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 
 			taskMetadatas := []util.TaskMetadata{
 				{
-					ID:     "dda3df5ddf512a650e3bd465647f93a52f7f636012ca12bd7ab33906245076e7",
+					ID:     "f6da796ed137cd53c9759b634aa80e2b93b5c66f7dc23db016d739d63496a430",
 					Sha256: "ca51217de9012bffe54390f1a91365af22a06279a3f2b3e57d4d2dc99b989588",
 				},
 				{
-					ID:     "384bd63e76fb2af034f44de7c2b1377eb3ad161ab75b0af1de73189b6c274035",
+					ID:     "9176125ce8d7b67276d077ab15af1a5809080f02f16efce2a3d2c4fce600bedd",
 					Sha256: "0d816dfc0753b877a04e3df93557bd3597fc7d0e308726655b14401c22a3b92a",
 				},
 				{
-					ID:     "d72baec2558ad1cdc53e00de5d98e2ed403d24d5ced55244e2ac6dec6db9b6e9",
+					ID:     "f5d1cbede9a750c5f3014d8aefef5f57a12ee4ee8d48e6201d19d42a69226b2c",
 					Sha256: "b5941d5a445040d3a792e5be361ca42989d97fc30ff53031f3004ccea8e44520",
 				},
 				{
-					ID:     "848a2731dce0f7e89255b95a4aee74431c0e306eb6ce968a5a70be5d3a707a8b",
+					ID:     "17d49b1b992fde658d1abfce6bae5877f48de760aba17cf573bd0e40e6a15001",
 					Sha256: "c1d6d1b2d5a367259e6e51a7f4d1ccd66a28cc9940d6599d8a8ea9544dd4b4a8",
 				},
 				{
-					ID:     "f89ed6841a98697e6e6379f27f5b43abb9546a7200ca908d0d085e3a1d9593f9",
+					ID:     "d68cb057073fb4eff2989e9110e7127d6812415db223a6658e8e71f3686b8acb",
 					Sha256: "2a1bc4e0f20bb5ed9a2197ecffde7eace4a9b9179048614205d025df73ba97c7",
 				},
 				{
-					ID:     "02061e017949a88360a3ba2794c4e95198f80c737cc35ec105f1f0a4da67fa8c",
+					ID:     "5ad1cd4c767450ad216b95bc438d4c228f0945cd247fb43f737ae9beac6fba4b",
 					Sha256: "078ea4eebc352a499d7bb6ff65fab1325226e524acac89a9db922ad91cab88f1",
 				},
 			}
@@ -84,33 +84,33 @@ var _ = Describe("Containerd with CRI support", func() {
 		})
 
 		It("rmi should be ok", Label("containerd", "rmi"), func() {
-			out, err := util.CriCtlCommand("rmi", "dragonflyoss/manager:v2.1.0").CombinedOutput()
+			out, err := util.CriCtlCommand("rmi", "ghcr.io/dragonflyoss/manager:v2.1.0").CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 		})
 	})
 
-	Context("dragonflyoss/scheduler:v2.0.0 image", func() {
+	Context("ghcr.io/dragonflyoss/scheduler:v2.0.0 image", func() {
 		It("pull should be ok", Label("containerd", "pull"), func() {
-			out, err := util.CriCtlCommand("pull", "dragonflyoss/scheduler:v2.0.0").CombinedOutput()
+			out, err := util.CriCtlCommand("pull", "ghcr.io/dragonflyoss/scheduler:v2.0.0").CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 
 			taskMetadatas := []util.TaskMetadata{
 				{
-					ID:     "bd2e2f7cbe2c6649214d62dc53b30f8ed1251366e0dc6422e25ef5c6a6a2bd60",
+					ID:     "6f55276e68f872fba78843019fd12a8461a14ccf4ac375057680123d3e4d8cbe",
 					Sha256: "0f4277a6444fbaf4eb5a7f39103e281dd57969953c7425edc7c8d4aa419347eb",
 				},
 				{
-					ID:     "23f48255ac61646aed5bbecc706ca539a7964e2128ff01911e492de654a63863",
+					ID:     "83b91ece0ebe89274fd99aed64fd4257bccde245e8da0fbbcdf7c4da8d5533de",
 					Sha256: "e55b67c1d5660c34dcb0d8e6923d0a50695a4f0d94f858353069bae17d0bfdea",
 				},
 				{
-					ID:     "0d5a5e975c20d654e79c468e6ffd94d647baabf62df73b594adcfeee3161c10f",
+					ID:     "6b6a238a08ddaed6594284cff238cdaf0cd0364570023e4731eefca3aa27a002",
 					Sha256: "8572bc8fb8a32061648dd183b2c0451c82be1bd053a4ea8fae991436b92faebb",
 				},
 				{
-					ID:     "45003cfb0ebaa79c19e5d8cf5950aace1b7595e10fae0ee2b71c5481f7fbbd2d",
+					ID:     "8e373a2dbd9a733585db5478a0d15bab88ec3d4c60f0ce064ef4d7453c97a05f",
 					Sha256: "88bfc12bad0cc91b2d47de4c7a755f6547b750256cc4c8b284e07aae13e4e041",
 				},
 			}
@@ -140,41 +140,41 @@ var _ = Describe("Containerd with CRI support", func() {
 		})
 
 		It("rmi should be ok", Label("containerd", "rmi"), func() {
-			out, err := util.CriCtlCommand("rmi", "dragonflyoss/scheduler:v2.0.0").CombinedOutput()
+			out, err := util.CriCtlCommand("rmi", "ghcr.io/dragonflyoss/scheduler:v2.0.0").CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 		})
 	})
 
-	Context("dragonflyoss/client:v0.1.30 image", func() {
+	Context("ghcr.io/dragonflyoss/client:v0.1.30 image", func() {
 		It("pull should be ok", Label("containerd", "pull"), func() {
-			out, err := util.CriCtlCommand("pull", "dragonflyoss/client:v0.1.30").CombinedOutput()
+			out, err := util.CriCtlCommand("pull", "ghcr.io/dragonflyoss/client:v0.1.30").CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 
 			taskMetadatas := []util.TaskMetadata{
 				{
-					ID:     "e7eb414a034771e5347c75d6414e87263a823fdcff9d125a06c357b19411d615",
+					ID:     "eae30e4f11c1f9e46305de15d560f161eca4339358684150bbc6b3636242fa08",
 					Sha256: "c8071d0de0f5bb17fde217dafdc9d2813ce9db77e60f6233bcd32f1c8888b121",
 				},
 				{
-					ID:     "999ea8db23bd6a89ace9e423b5780196a1856212edce12eb44d56a5573ce2ff5",
+					ID:     "fc4538dc3b9f25e601a59302e6edcf7cb9eaf97c4ecda5fd3f600de736e3e5dd",
 					Sha256: "e964513726885fa2f977425fc889eabbe25c9fa47e7a4b0ec5e2baef96290f47",
 				},
 				{
-					ID:     "62e9b2b958f28f12f3ac8710dc4fab576268008e6115759e5dbd263e7a4afba3",
+					ID:     "53cc7eb8cfe8f396d7dcaa25163bdd65720e4ac5d39a70d8a595abde26b86f22",
 					Sha256: "0e304933d7eae4674e05b3bc409f236c65077e2b7055119bbd66ff613fe5e1ad",
 				},
 				{
-					ID:     "a96b36f50370a5dbed258f13fd84b216b99992f49520643017b2845adca784ea",
+					ID:     "8961dce0ceecdf7eeace18af8c9e5404b279b5cd541f9220c42e049c738d00b9",
 					Sha256: "53b01ef3d5d676a8514ded6b469932e33d84738e5e00932ca124382a8567c44b",
 				},
 				{
-					ID:     "f314d50106ab72ca9f3d1ebbbf4a71bcb0efb861a1efc70cb707a4204df52250",
+					ID:     "829047ff8b3ef37c68764e73ad50dfbf3e657419fa6bf1b373c46ad5dfc48768",
 					Sha256: "c9d959fc168ad8bdc9a021066eb9c1dd4de8e860c03619a88d8ba0ff5479d9ea",
 				},
 				{
-					ID:     "9df82cfbd39d9956071967f8ef4b04f50674d01cc835bcc8e9f572c484ab3c39",
+					ID:     "7f784cfc82e45628e6cd35fae45b61a0e9ce66b772542f03d650534a34a8297c",
 					Sha256: "b6acfae843b58bf14369ebbeafa96af5352cde9a89f8255ca51f92b233a6e405",
 				},
 			}
@@ -204,29 +204,29 @@ var _ = Describe("Containerd with CRI support", func() {
 		})
 
 		It("rmi should be ok", Label("containerd", "rmi"), func() {
-			out, err := util.CriCtlCommand("rmi", "dragonflyoss/client:v0.1.30").CombinedOutput()
+			out, err := util.CriCtlCommand("rmi", "ghcr.io/dragonflyoss/client:v0.1.30").CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 		})
 	})
 
-	Context("dragonflyoss/dfinit:v0.1.30 image", func() {
+	Context("ghcr.io/dragonflyoss/dfinit:v0.1.30 image", func() {
 		It("pull should be ok", Label("containerd", "pull"), func() {
-			out, err := util.CriCtlCommand("pull", "dragonflyoss/dfinit:v0.1.30").CombinedOutput()
+			out, err := util.CriCtlCommand("pull", "ghcr.io/dragonflyoss/dfinit:v0.1.30").CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 
 			taskMetadatas := []util.TaskMetadata{
 				{
-					ID:     "b08c8967e69896dda94b814d56c4154d8599c4660349e3722de01b214cbb122e",
+					ID:     "ec17104ac49cf85fced3652f854e09b0cf0948fb232b136e3f57be3f9aeb77b2",
 					Sha256: "c58d97dd21c3b3121f262a1fbb5a278f77ab85dba7a02b819e710f34683cf746",
 				},
 				{
-					ID:     "48f0dc8525c8652c6b9910c617367ca35d796880626c4044534ca35724f11a53",
+					ID:     "2453086dcc76db72d09a710be96625d53a41c78747fd56c6ea1f2f340691b731",
 					Sha256: "2ff0ae26fa61a2b0f88f470a8e50f7623ea48b224eb072a5878a20d663d5307d",
 				},
 				{
-					ID:     "c652a1dd59249ca4f7eff3a61f4fdd5cb7c17215fe721a9ed6e105acf34bc6d9",
+					ID:     "4f89c2f02c36714b19cde131a654babc558c261abb6ee2c94ff54b5fcd4c8daf",
 					Sha256: "b1826117441e607acd3b98c93cdb16759c2cc2240852055b8a2b5860f3204f1e",
 				},
 			}
@@ -256,7 +256,7 @@ var _ = Describe("Containerd with CRI support", func() {
 		})
 
 		It("rmi should be ok", Label("containerd", "rmi"), func() {
-			out, err := util.CriCtlCommand("rmi", "dragonflyoss/dfinit:v0.1.30").CombinedOutput()
+			out, err := util.CriCtlCommand("rmi", "ghcr.io/dragonflyoss/dfinit:v0.1.30").CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 		})

diff --git a/test/e2e/v2/manager/preheat.go b/test/e2e/v2/manager/preheat.go
@@ -172,7 +172,7 @@ var _ = Describe("Preheat with Manager", func() {
 		})
 	})
 
-	Context("busybox:v1.35.0 image", func() {
+	Context("ghcr.io/dragonflyoss/busybox:v1.35.0 image", func() {
 		It("preheat image should be ok", Label("preheat", "image"), func() {
 			managerPod, err := util.ManagerExec(0)
 			fmt.Println(err)
@@ -182,7 +182,7 @@ var _ = Describe("Preheat with Manager", func() {
 				Type: internaljob.PreheatJob,
 				Args: types.PreheatArgs{
 					Type: "image",
-					URL:  "https://index.docker.io/v2/dragonflyoss/busybox/manifests/1.35.0",
+					URL:  "https://ghcr.io/v2/dragonflyoss/busybox/manifests/1.35.0",
 				},
 			})
 			Expect(err).NotTo(HaveOccurred())
@@ -201,11 +201,11 @@ var _ = Describe("Preheat with Manager", func() {
 
 			taskMetadatas := []util.TaskMetadata{
 				{
-					ID:     "b6922209dc9616f8736a860e93c3cd7288a4e801517f88eec3df514606d18cdf",
+					ID:     "50f91088cd60a49bf565396c1f7ba1f8b9d32c9f1541d2e06b085c780030805a",
 					Sha256: "a711f05d33845e2e9deffcfcc5adf082d7c6e97e3e3a881d193d9aae38f092a8",
 				},
 				{
-					ID:     "c0dfae864ae65c285676063eb148d0a0064d5c6c39367fee0bcc1f3700c39c31",
+					ID:     "a048c8c66a652030fba31514735ff51288c54f72f878e363948303ded065e199",
 					Sha256: "f643e116a03d9604c344edb345d7592c48cc00f2a4848aaf773411f4fb30d2f5",
 				},
 			}
@@ -225,7 +225,7 @@ var _ = Describe("Preheat with Manager", func() {
 		})
 	})
 
-	Context("dragonflyoss/scheduler:v2.1.0 image", func() {
+	Context("ghcr.io/dragonflyoss/scheduler:v2.1.0 image", func() {
 		It("preheat image for linux/amd64 platform should be ok", Label("preheat", "image"), func() {
 			managerPod, err := util.ManagerExec(0)
 			fmt.Println(err)
@@ -235,7 +235,7 @@ var _ = Describe("Preheat with Manager", func() {
 				Type: internaljob.PreheatJob,
 				Args: types.PreheatArgs{
 					Type:     "image",
-					URL:      "https://index.docker.io/v2/dragonflyoss/scheduler/manifests/v2.1.0",
+					URL:      "https://ghcr.io/v2/dragonflyoss/scheduler/manifests/v2.1.0",
 					Platform: "linux/amd64",
 				},
 			})
@@ -255,23 +255,19 @@ var _ = Describe("Preheat with Manager", func() {
 
 			taskMetadatas := []util.TaskMetadata{
 				{
-					ID:     "c8ca6a17354d3a79397eef26803e5af84d00a3fd64b0f823922086a31ebdee18",
+					ID:     "1a2cf94649557d3e978f355bcc8eaffadd4c8d41e334fc93adc3ea49488d1200",
 					Sha256: "f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944",
 				},
 				{
-					ID:     "b8de5865e2ebf537279683adfbdb5f858b0c7212e5744a1df233086496c245d7",
-					Sha256: "c1d6d1b2d5a367259e6e51a7f4d1ccd66a28cc9940d6599d8a8ea9544dd4b4a8",
-				},
-				{
-					ID:     "e4bf0d4b551afda56f9627c81ee02ab4360865d37c7dd43586e37f26f4386806",
+					ID:     "ba71de48fb521ec52a4dff60106af10512eb21a40b8fd1756467af19592e6a74",
 					Sha256: "871ab018db94b4ae7b137764837bc4504393a60656ba187189e985cd809064f7",
 				},
 				{
-					ID:     "7da0721fd078dd46a63298747ffde8fcbe12b53378f282c9def693615ac7993e",
+					ID:     "3cf396cec1d067374714655cf98f5e505626d1b6cdec094b1469b3c98569e3d1",
 					Sha256: "f1a1d290795d904815786e41d39a41dc1af5de68a9e9020baba8bd83b32d8f95",
 				},
 				{
-					ID:     "3639c8c5712e77acd3751142c83150c0a12284a54fa41224a1c7acc0e343020d",
+					ID:     "b04072342af19c13fcda146a71727edd03442d9851ca185d297f53442ba12a22",
 					Sha256: "f1ffc4b5459e82dc8e7ddd1d1a2ec469e85a1f076090c22851a1f2ce6f71e1a6",
 				},
 			}
@@ -299,7 +295,7 @@ var _ = Describe("Preheat with Manager", func() {
 				Type: internaljob.PreheatJob,
 				Args: types.PreheatArgs{
 					Type:     "image",
-					URL:      "https://index.docker.io/v2/dragonflyoss/scheduler/manifests/v2.1.0",
+					URL:      "https://ghcr.io/v2/dragonflyoss/scheduler/manifests/v2.2.0",
 					Platform: "linux/arm64",
 				},
 			})
@@ -319,24 +315,24 @@ var _ = Describe("Preheat with Manager", func() {
 
 			taskMetadatas := []util.TaskMetadata{
 				{
-					ID:     "9869dbb01ac214e90e4ae667e42d50210c2ff1e63292d73b14f0a7a2226c0320",
-					Sha256: "a0d7a8f11f7e25ca59f0bf470187dd9aa27e7ca951cf67a53c750deea5d3b076",
+					ID:     "d83d909b2ec5660323a4225149fb87886f9897cf6098ffcb108a77ac252facaf",
+					Sha256: "9986a736f7d3d24bb01b0a560fa0f19c4b57e56c646e1f998941529d28710e6b",
 				},
 				{
-					ID:     "ab049caee13f77d91568d954a5d32f5d2354497cab098887a8a663656daa9840",
-					Sha256: "a880266d3b77f75696023df2da1ef66c3c565e0f70596242395c9e68de955c7c",
+					ID:     "0eb92ed9ea3561063efceaf414e2a5431410d5ba76523bb2e0a4793fdf9a38b1",
+					Sha256: "f7307687fd72fb79eadd7f38f8cb9675b76480e32365a5d282a06f788944e9f2",
 				},
 				{
-					ID:     "e4bf0d4b551afda56f9627c81ee02ab4360865d37c7dd43586e37f26f4386806",
-					Sha256: "871ab018db94b4ae7b137764837bc4504393a60656ba187189e985cd809064f7",
+					ID:     "45e6cddeb6d117e61312e3913779b88e3ac8c37f8df2f0814bf2d8cda6f784d7",
+					Sha256: "fc5951fb196d09e569f4592b50e3a71ad01d11da229b8a500fea278eba0170c5",
 				},
 				{
-					ID:     "a26e1ac8b70926f45766fcf886f23a833793c39c62237bcda9ffeb158131c0d6",
-					Sha256: "9b5952218d7711195c6c6fbddbef2780507d20851ca68845d180397d1348f0d8",
+					ID:     "e1ab22f7ff59940064e2ffde854fe3e0fcd23267268ff382696875c49844c985",
+					Sha256: "c7c72808bf776cd122bdaf4630a4a35ea319603d6a3b6cbffddd4c7fd6d2d269",
 				},
 				{
-					ID:     "7376f665077e91cd0dc410c00242ab88775e3eae19eca4b7b3a29ded14fc3754",
-					Sha256: "889f4c960ac4ff70774e9c4cfa64efc4823ade0702d0f96c20ff0054ffbbe504",
+					ID:     "56ee9d6d3bcac9e6543073e175ba2a0ee5d37c27d6e1a7daabeea44b7fbdd4a4",
+					Sha256: "edbf1aa1d62d9c17605c1ee2d9dff43489bc0f8ae056367734386c35bfae226a",
 				},
 			}
 

diff --git a/test/testdata/charts/config-v2.yaml b/test/testdata/charts/config-v2.yaml
@@ -98,7 +98,7 @@ seedClient:
     scheduler:
       announceInterval: 1s
     log:
-      level: info
+      level: debug
     proxy:
       prefetch: true
       registryMirror:
@@ -157,7 +157,7 @@ client:
     scheduler:
       announceInterval: 1s
     log:
-      level: info 
+      level: debug
     proxy:
       prefetch: false
       registryMirror:
+25 −10		Cargo.lock
+9 −9		Cargo.toml
+0 −18		dragonfly-client-config/build.rs
+1 −1		dragonfly-client-storage/Cargo.toml
+33 −33		dragonfly-client-storage/src/content.rs
+1 −1		dragonfly-client-util/Cargo.toml
+5 −3		dragonfly-client-util/src/digest/mod.rs