dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: rename e2eutil to util (#3122) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2024-03-14 13:20:29 +08:00 committed by GitHub
parent 8ec6305cdb
commit daf307b5d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/concurrency_test.go
View File

@ -22,43 +22,43 @@ import (
. "github.com/onsi/ginkgo/v2" //nolint . "github.com/onsi/ginkgo/v2" //nolint
. "github.com/onsi/gomega" //nolint . "github.com/onsi/gomega" //nolint
"d7y.io/dragonfly/v2/test/e2e/e2eutil" "d7y.io/dragonfly/v2/test/e2e/util"
) )
var _ = Describe("Download concurrency", func() { var _ = Describe("Download concurrency", func() {
Context("ab", func() { Context("ab", func() {
It("concurrent 100 should be ok", Label("concurrent", "100"), func() { It("concurrent 100 should be ok", Label("concurrent", "100"), func() {
url := e2eutil.GetFileURL(hostnameFilePath) url := util.GetFileURL(hostnameFilePath)
fmt.Println("download url " + url) fmt.Println("download url " + url)
out, err := e2eutil.ABCommand("-c", "100", "-n", "200", "-X", proxy, url).CombinedOutput() out, err := util.ABCommand("-c", "100", "-n", "200", "-X", proxy, url).CombinedOutput()
fmt.Println(string(out)) fmt.Println(string(out))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
It("concurrent 200 should be ok", Label("concurrent", "200"), func() { It("concurrent 200 should be ok", Label("concurrent", "200"), func() {
url := e2eutil.GetFileURL(hostnameFilePath) url := util.GetFileURL(hostnameFilePath)
fmt.Println("download url " + url) fmt.Println("download url " + url)
out, err := e2eutil.ABCommand("-c", "200", "-n", "400", "-X", proxy, url).CombinedOutput() out, err := util.ABCommand("-c", "200", "-n", "400", "-X", proxy, url).CombinedOutput()
fmt.Println(string(out)) fmt.Println(string(out))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
It("concurrent 500 should be ok", Label("concurrent", "500"), func() { It("concurrent 500 should be ok", Label("concurrent", "500"), func() {
url := e2eutil.GetFileURL(hostnameFilePath) url := util.GetFileURL(hostnameFilePath)
fmt.Println("download url " + url) fmt.Println("download url " + url)
out, err := e2eutil.ABCommand("-c", "500", "-n", "1000", "-X", proxy, url).CombinedOutput() out, err := util.ABCommand("-c", "500", "-n", "1000", "-X", proxy, url).CombinedOutput()
fmt.Println(string(out)) fmt.Println(string(out))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
It("concurrent 1000 should be ok", Label("concurrent", "1000"), func() { It("concurrent 1000 should be ok", Label("concurrent", "1000"), func() {
url := e2eutil.GetFileURL(hostnameFilePath) url := util.GetFileURL(hostnameFilePath)
fmt.Println("download url " + url) fmt.Println("download url " + url)
out, err := e2eutil.ABCommand("-c", "1000", "-n", "2000", "-X", proxy, url).CombinedOutput() out, err := util.ABCommand("-c", "1000", "-n", "2000", "-X", proxy, url).CombinedOutput()
fmt.Println(string(out)) fmt.Println(string(out))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })

6
test/e2e/containerd_test.go
View File

@ -22,19 +22,19 @@ import (
. "github.com/onsi/ginkgo/v2" //nolint . "github.com/onsi/ginkgo/v2" //nolint
. "github.com/onsi/gomega" //nolint . "github.com/onsi/gomega" //nolint
"d7y.io/dragonfly/v2/test/e2e/e2eutil" "d7y.io/dragonfly/v2/test/e2e/util"
) )
var _ = Describe("Containerd with CRI support", func() { var _ = Describe("Containerd with CRI support", func() {
Context("docker.io/library/busybox:latest image", func() { Context("docker.io/library/busybox:latest image", func() {
It("pull should be ok", Label("containerd", "pull"), func() { It("pull should be ok", Label("containerd", "pull"), func() {
out, err := e2eutil.CriCtlCommand("pull", "d7y.io/library/busybox:latest").CombinedOutput() out, err := util.CriCtlCommand("pull", "d7y.io/library/busybox:latest").CombinedOutput()
fmt.Println(string(out)) fmt.Println(string(out))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
It("rmi should be ok", Label("containerd", "rmi"), func() { It("rmi should be ok", Label("containerd", "rmi"), func() {
out, err := e2eutil.CriCtlCommand("rmi", "d7y.io/library/busybox:latest").CombinedOutput() out, err := util.CriCtlCommand("rmi", "d7y.io/library/busybox:latest").CombinedOutput()
fmt.Println(string(out)) fmt.Println(string(out))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })

52
test/e2e/dfget_test.go
View File

@ -27,7 +27,7 @@ import (
. "github.com/onsi/gomega" //nolint . "github.com/onsi/gomega" //nolint
"d7y.io/dragonfly/v2/pkg/net/http" "d7y.io/dragonfly/v2/pkg/net/http"
"d7y.io/dragonfly/v2/test/e2e/e2eutil" "d7y.io/dragonfly/v2/test/e2e/util"
) )
var _ = Describe("Download with dfget and proxy", func() { var _ = Describe("Download with dfget and proxy", func() {
@ -48,15 +48,15 @@ var _ = Describe("Download with dfget and proxy", func() {
func getFileSizes() map[string]int { func getFileSizes() map[string]int {
var ( var (
details = map[string]int{} details = map[string]int{}
files = e2eutil.GetFileList() files = util.GetFileList()
) )
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateEmptyFile) { if util.FeatureGates.Enabled(util.FeatureGateEmptyFile) {
fmt.Printf("dfget-empty-file feature gate enabled\n") fmt.Printf("dfget-empty-file feature gate enabled\n")
files = append(files, "/tmp/empty-file") files = append(files, "/tmp/empty-file")
} }
for _, path := range files { for _, path := range files {
out, err := e2eutil.DockerCommand("stat", "--printf=%s", path).CombinedOutput() out, err := util.DockerCommand("stat", "--printf=%s", path).CombinedOutput()
if err != nil { if err != nil {
fmt.Printf("stat %s erro: %s, stdout: %s", path, err, string(out)) fmt.Printf("stat %s erro: %s, stdout: %s", path, err, string(out))
} }
@ -96,7 +96,7 @@ func getRandomRange(size int) *http.Range {
func singleDfgetTest(name, ns, label, podNamePrefix, container string) { func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
It(name, Label("download", "normal"), func() { It(name, Label("download", "normal"), func() {
fileDetails := getFileSizes() fileDetails := getFileSizes()
out, err := e2eutil.KubeCtlCommand("-n", ns, "get", "pod", "-l", label, out, err := util.KubeCtlCommand("-n", ns, "get", "pod", "-l", label,
"-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput() "-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput()
podName := strings.Trim(string(out), "'") podName := strings.Trim(string(out), "'")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -104,8 +104,8 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
Expect(strings.HasPrefix(podName, podNamePrefix)).Should(BeTrue()) Expect(strings.HasPrefix(podName, podNamePrefix)).Should(BeTrue())
// copy test tools into container // copy test tools into container
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateRange) { if util.FeatureGates.Enabled(util.FeatureGateRange) {
out, err = e2eutil.KubeCtlCommand("-n", ns, "cp", "-c", container, "/tmp/sha256sum-offset", out, err = util.KubeCtlCommand("-n", ns, "cp", "-c", container, "/tmp/sha256sum-offset",
fmt.Sprintf("%s:/bin/", podName)).CombinedOutput() fmt.Sprintf("%s:/bin/", podName)).CombinedOutput()
if err != nil { if err != nil {
fmt.Println(string(out)) fmt.Println(string(out))
@ -113,7 +113,7 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
pod := e2eutil.NewPodExec(ns, podName, container) pod := util.NewPodExec(ns, podName, container)
// install curl // install curl
out, err = pod.Command("apk", "add", "-U", "curl").CombinedOutput() out, err = pod.Command("apk", "add", "-U", "curl").CombinedOutput()
@ -125,25 +125,25 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
if size == 0 { if size == 0 {
continue continue
} }
url1 := e2eutil.GetFileURL(path) url1 := util.GetFileURL(path)
url2 := e2eutil.GetNoContentLengthFileURL(path) url2 := util.GetNoContentLengthFileURL(path)
// make ranged requests to invoke prefetch feature // make ranged requests to invoke prefetch feature
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateRange) { if util.FeatureGates.Enabled(util.FeatureGateRange) {
rg1, rg2 := getRandomRange(size), getRandomRange(size) rg1, rg2 := getRandomRange(size), getRandomRange(size)
downloadSingleFile(ns, pod, path, url1, size, rg1, rg1.String()) downloadSingleFile(ns, pod, path, url1, size, rg1, rg1.String())
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateNoLength) { if util.FeatureGates.Enabled(util.FeatureGateNoLength) {
downloadSingleFile(ns, pod, path, url2, size, rg2, rg2.String()) downloadSingleFile(ns, pod, path, url2, size, rg2, rg2.String())
} }
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateOpenRange) { if util.FeatureGates.Enabled(util.FeatureGateOpenRange) {
rg3, rg4 := getRandomRange(size), getRandomRange(size) rg3, rg4 := getRandomRange(size), getRandomRange(size)
// set target length // set target length
rg3.Length = int64(size) - rg3.Start rg3.Length = int64(size) - rg3.Start
rg4.Length = int64(size) - rg4.Start rg4.Length = int64(size) - rg4.Start
downloadSingleFile(ns, pod, path, url1, size, rg3, fmt.Sprintf("bytes=%d-", rg3.Start)) downloadSingleFile(ns, pod, path, url1, size, rg3, fmt.Sprintf("bytes=%d-", rg3.Start))
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateNoLength) { if util.FeatureGates.Enabled(util.FeatureGateNoLength) {
downloadSingleFile(ns, pod, path, url2, size, rg4, fmt.Sprintf("bytes=%d-", rg4.Start)) downloadSingleFile(ns, pod, path, url2, size, rg4, fmt.Sprintf("bytes=%d-", rg4.Start))
} }
} }
@ -151,13 +151,13 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
downloadSingleFile(ns, pod, path, url1, size, nil, "") downloadSingleFile(ns, pod, path, url1, size, nil, "")
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateNoLength) { if util.FeatureGates.Enabled(util.FeatureGateNoLength) {
downloadSingleFile(ns, pod, path, url2, size, nil, "") downloadSingleFile(ns, pod, path, url2, size, nil, "")
} }
} }
}) })
It(name+" - recursive with dfget", Label("download", "recursive", "dfget"), func() { It(name+" - recursive with dfget", Label("download", "recursive", "dfget"), func() {
if !e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateRecursive) { if !util.FeatureGates.Enabled(util.FeatureGateRecursive) {
fmt.Println("feature gate recursive is disable, skip") fmt.Println("feature gate recursive is disable, skip")
return return
} }
@ -169,12 +169,12 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
// sha256sum txt: /host/tmp/dragonfly-test.sha256sum.txt // sha256sum txt: /host/tmp/dragonfly-test.sha256sum.txt
subDirs := []string{"bin", "lib64", "libexec", "sbin"} subDirs := []string{"bin", "lib64", "libexec", "sbin"}
out, err := e2eutil.KubeCtlCommand("-n", ns, "get", "pod", "-l", label, out, err := util.KubeCtlCommand("-n", ns, "get", "pod", "-l", label,
"-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput() "-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput()
podName := strings.Trim(string(out), "'") podName := strings.Trim(string(out), "'")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
fmt.Println("test in pod: " + podName) fmt.Println("test in pod: " + podName)
pod := e2eutil.NewPodExec(ns, podName, container) pod := util.NewPodExec(ns, podName, container)
for _, dir := range subDirs { for _, dir := range subDirs {
var dfget []string var dfget []string
@ -209,7 +209,7 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
sha256sum1 := strings.TrimSpace(string(out)) sha256sum1 := strings.TrimSpace(string(out))
// get the original sha256sum in minio pod // get the original sha256sum in minio pod
minioPod := e2eutil.NewPodExec("dragonfly-e2e", "minio-0", "minio") minioPod := util.NewPodExec("dragonfly-e2e", "minio-0", "minio")
out, err = minioPod.Command("cat", "/host/tmp/dragonfly-test.sha256sum.txt").CombinedOutput() out, err = minioPod.Command("cat", "/host/tmp/dragonfly-test.sha256sum.txt").CombinedOutput()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
sha256sum2 := strings.TrimSpace(string(out)) sha256sum2 := strings.TrimSpace(string(out))
@ -222,7 +222,7 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
}) })
It(name+" - recursive with grpc", Label("download", "recursive", "grpc"), func() { It(name+" - recursive with grpc", Label("download", "recursive", "grpc"), func() {
if !e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateRecursive) { if !util.FeatureGates.Enabled(util.FeatureGateRecursive) {
fmt.Println("feature gate recursive is disable, skip") fmt.Println("feature gate recursive is disable, skip")
return return
} }
@ -234,15 +234,15 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
// sha256sum txt: /host/tmp/dragonfly-test.sha256sum.txt // sha256sum txt: /host/tmp/dragonfly-test.sha256sum.txt
subDirs := []string{"bin", "lib64", "libexec", "sbin"} subDirs := []string{"bin", "lib64", "libexec", "sbin"}
out, err := e2eutil.KubeCtlCommand("-n", ns, "get", "pod", "-l", label, out, err := util.KubeCtlCommand("-n", ns, "get", "pod", "-l", label,
"-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput() "-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput()
podName := strings.Trim(string(out), "'") podName := strings.Trim(string(out), "'")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
fmt.Println("test in pod: " + podName) fmt.Println("test in pod: " + podName)
pod := e2eutil.NewPodExec(ns, podName, container) pod := util.NewPodExec(ns, podName, container)
// copy test tools into container // copy test tools into container
out, err = e2eutil.KubeCtlCommand("-n", ns, "cp", "-c", container, "/tmp/download-grpc-test", out, err = util.KubeCtlCommand("-n", ns, "cp", "-c", container, "/tmp/download-grpc-test",
fmt.Sprintf("%s:/bin/", podName)).CombinedOutput() fmt.Sprintf("%s:/bin/", podName)).CombinedOutput()
if err != nil { if err != nil {
fmt.Println(string(out)) fmt.Println(string(out))
@ -269,7 +269,7 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
sha256sum1 := strings.TrimSpace(string(out)) sha256sum1 := strings.TrimSpace(string(out))
// get the original sha256sum in minio pod // get the original sha256sum in minio pod
minioPod := e2eutil.NewPodExec("dragonfly-e2e", "minio-0", "minio") minioPod := util.NewPodExec("dragonfly-e2e", "minio-0", "minio")
out, err = minioPod.Command("cat", "/host/tmp/dragonfly-test.sha256sum.txt").CombinedOutput() out, err = minioPod.Command("cat", "/host/tmp/dragonfly-test.sha256sum.txt").CombinedOutput()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
sha256sum2 := strings.TrimSpace(string(out)) sha256sum2 := strings.TrimSpace(string(out))
@ -282,7 +282,7 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
}) })
} }
func downloadSingleFile(ns string, pod *e2eutil.PodExec, path, url string, size int, rg *http.Range, rawRg string) { func downloadSingleFile(ns string, pod *util.PodExec, path, url string, size int, rg *http.Range, rawRg string) {
var ( var (
sha256sum []string sha256sum []string
dfget []string dfget []string
@ -320,7 +320,7 @@ func downloadSingleFile(ns string, pod *e2eutil.PodExec, path, url string, size
url, size, rawRg, rg.Length) url, size, rawRg, rg.Length)
} }
// get original file digest // get original file digest
out, err := e2eutil.DockerCommand(sha256sum...).CombinedOutput() out, err := util.DockerCommand(sha256sum...).CombinedOutput()
fmt.Println("original sha256sum: " + string(out)) fmt.Println("original sha256sum: " + string(out))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
sha256sum1 := strings.Split(string(out), " ")[0] sha256sum1 := strings.Split(string(out), " ")[0]

36
test/e2e/e2e_test.go
View File

@ -28,8 +28,8 @@ import (
. "github.com/onsi/ginkgo/v2" //nolint . "github.com/onsi/ginkgo/v2" //nolint
. "github.com/onsi/gomega" //nolint . "github.com/onsi/gomega" //nolint
"d7y.io/dragonfly/v2/test/e2e/e2eutil"
_ "d7y.io/dragonfly/v2/test/e2e/manager" _ "d7y.io/dragonfly/v2/test/e2e/manager"
"d7y.io/dragonfly/v2/test/e2e/util"
) )
var featureGatesFlag string var featureGatesFlag string
@ -41,21 +41,21 @@ func init() {
var _ = AfterSuite(func() { var _ = AfterSuite(func() {
for _, server := range servers { for _, server := range servers {
for i := 0; i < server.replicas; i++ { for i := 0; i < server.replicas; i++ {
out, err := e2eutil.KubeCtlCommand("-n", server.namespace, "get", "pod", "-l", fmt.Sprintf("component=%s", server.name), out, err := util.KubeCtlCommand("-n", server.namespace, "get", "pod", "-l", fmt.Sprintf("component=%s", server.name),
"-o", fmt.Sprintf("jsonpath='{.items[%d].metadata.name}'", i)).CombinedOutput() "-o", fmt.Sprintf("jsonpath='{.items[%d].metadata.name}'", i)).CombinedOutput()
if err != nil { if err != nil {
fmt.Printf("get pod error: %s, output: %s\n", err, string(out)) fmt.Printf("get pod error: %s, output: %s\n", err, string(out))
continue continue
} }
podName := strings.Trim(string(out), "'") podName := strings.Trim(string(out), "'")
pod := e2eutil.NewPodExec(server.namespace, podName, server.name) pod := util.NewPodExec(server.namespace, podName, server.name)
var ( var (
retryCount = 0 retryCount = 0
maxRetryCount = 10 maxRetryCount = 10
) )
retry: retry:
countOut, err := e2eutil.KubeCtlCommand("-n", server.namespace, "get", "pod", "-l", fmt.Sprintf("component=%s", server.name), countOut, err := util.KubeCtlCommand("-n", server.namespace, "get", "pod", "-l", fmt.Sprintf("component=%s", server.name),
"-o", fmt.Sprintf("jsonpath='{.items[%d].status.containerStatuses[0].restartCount}'", i)).CombinedOutput() "-o", fmt.Sprintf("jsonpath='{.items[%d].status.containerStatuses[0].restartCount}'", i)).CombinedOutput()
if err != nil { if err != nil {
fmt.Printf("get pod %s restart count error: %s, output: %s\n", podName, err, string(countOut)) fmt.Printf("get pod %s restart count error: %s, output: %s\n", podName, err, string(countOut))
@ -86,17 +86,17 @@ var _ = AfterSuite(func() {
} }
if count > 0 { if count > 0 {
if err := e2eutil.UploadArtifactPrevStdout(server.namespace, podName, fmt.Sprintf("%s-%d", server.name, i), server.name); err != nil { if err := util.UploadArtifactPrevStdout(server.namespace, podName, fmt.Sprintf("%s-%d", server.name, i), server.name); err != nil {
fmt.Printf("upload pod %s artifact stdout file error: %v\n", podName, err) fmt.Printf("upload pod %s artifact stdout file error: %v\n", podName, err)
} }
} }
if err := e2eutil.UploadArtifactStdout(server.namespace, podName, fmt.Sprintf("%s-%d", server.name, i), server.name); err != nil { if err := util.UploadArtifactStdout(server.namespace, podName, fmt.Sprintf("%s-%d", server.name, i), server.name); err != nil {
fmt.Printf("upload pod %s artifact prev stdout file error: %v\n", podName, err) fmt.Printf("upload pod %s artifact prev stdout file error: %v\n", podName, err)
} }
if server.pprofPort > 0 { if server.pprofPort > 0 {
if out, err := e2eutil.UploadArtifactPProf(server.namespace, podName, if out, err := util.UploadArtifactPProf(server.namespace, podName,
fmt.Sprintf("%s-%d", server.name, i), server.name, server.pprofPort); err != nil { fmt.Sprintf("%s-%d", server.name, i), server.name, server.pprofPort); err != nil {
fmt.Printf("upload pod %s artifact pprof error: %v, output: %s\n", podName, err, out) fmt.Printf("upload pod %s artifact pprof error: %v, output: %s\n", podName, err, out)
} }
@ -107,14 +107,14 @@ var _ = AfterSuite(func() {
}) })
var _ = BeforeSuite(func() { var _ = BeforeSuite(func() {
err := e2eutil.FeatureGates.Set(featureGatesFlag) err := util.FeatureGates.Set(featureGatesFlag)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
fmt.Printf("feature gates: %q, flags: %q\n", e2eutil.FeatureGates.String(), featureGatesFlag) fmt.Printf("feature gates: %q, flags: %q\n", util.FeatureGates.String(), featureGatesFlag)
mode := os.Getenv("DRAGONFLY_COMPATIBILITY_E2E_TEST_MODE") mode := os.Getenv("DRAGONFLY_COMPATIBILITY_E2E_TEST_MODE")
imageName := os.Getenv("DRAGONFLY_COMPATIBILITY_E2E_TEST_IMAGE") imageName := os.Getenv("DRAGONFLY_COMPATIBILITY_E2E_TEST_IMAGE")
if mode != "" && imageName != "" { if mode != "" && imageName != "" {
rawImages, err := e2eutil.KubeCtlCommand("-n", dragonflyNamespace, "get", "pod", "-l", fmt.Sprintf("component=%s", mode), rawImages, err := util.KubeCtlCommand("-n", dragonflyNamespace, "get", "pod", "-l", fmt.Sprintf("component=%s", mode),
"-o", "jsonpath='{range .items[0]}{.spec.containers[0].image}{end}'").CombinedOutput() "-o", "jsonpath='{range .items[0]}{.spec.containers[0].image}{end}'").CombinedOutput()
image := strings.Trim(string(rawImages), "'") image := strings.Trim(string(rawImages), "'")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -124,25 +124,25 @@ var _ = BeforeSuite(func() {
Expect(fmt.Sprintf("dragonflyoss/%s:%s", imageName, stableImageTag)).To(Equal(image)) Expect(fmt.Sprintf("dragonflyoss/%s:%s", imageName, stableImageTag)).To(Equal(image))
} }
rawGitCommit, err := e2eutil.GitCommand("rev-parse", "--short", "HEAD").CombinedOutput() rawGitCommit, err := util.GitCommand("rev-parse", "--short", "HEAD").CombinedOutput()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
gitCommit := strings.Fields(string(rawGitCommit))[0] gitCommit := strings.Fields(string(rawGitCommit))[0]
fmt.Printf("git merge commit: %s\n", gitCommit) fmt.Printf("git merge commit: %s\n", gitCommit)
rawPodName, err := e2eutil.KubeCtlCommand("-n", dragonflyNamespace, "get", "pod", "-l", "component=dfdaemon", rawPodName, err := util.KubeCtlCommand("-n", dragonflyNamespace, "get", "pod", "-l", "component=dfdaemon",
"-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput() "-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput()
podName := strings.Trim(string(rawPodName), "'") podName := strings.Trim(string(rawPodName), "'")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(strings.HasPrefix(podName, "dragonfly-dfdaemon-")).Should(BeTrue()) Expect(strings.HasPrefix(podName, "dragonfly-dfdaemon-")).Should(BeTrue())
pod := e2eutil.NewPodExec(dragonflyNamespace, podName, "dfdaemon") pod := util.NewPodExec(dragonflyNamespace, podName, "dfdaemon")
rawDfgetVersion, err := pod.Command("dfget", "version").CombinedOutput() rawDfgetVersion, err := pod.Command("dfget", "version").CombinedOutput()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
dfgetGitCommit := strings.Fields(string(rawDfgetVersion))[7] dfgetGitCommit := strings.Fields(string(rawDfgetVersion))[7]
fmt.Printf("raw dfget version:\n%s\n", rawDfgetVersion) fmt.Printf("raw dfget version:\n%s\n", rawDfgetVersion)
fmt.Printf("dfget merge commit: %s\n", dfgetGitCommit) fmt.Printf("dfget merge commit: %s\n", dfgetGitCommit)
if !e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateCommit) { if !util.FeatureGates.Enabled(util.FeatureGateCommit) {
return return
} }
if mode == dfdaemonCompatibilityTestMode { if mode == dfdaemonCompatibilityTestMode {
@ -152,16 +152,16 @@ var _ = BeforeSuite(func() {
Expect(gitCommit).To(Equal(dfgetGitCommit)) Expect(gitCommit).To(Equal(dfgetGitCommit))
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateRange) { if util.FeatureGates.Enabled(util.FeatureGateRange) {
out, err := e2eutil.DockerCopy("/bin/", "/tmp/sha256sum-offset").CombinedOutput() out, err := util.DockerCopy("/bin/", "/tmp/sha256sum-offset").CombinedOutput()
if err != nil { if err != nil {
fmt.Println(string(out)) fmt.Println(string(out))
} }
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
if e2eutil.FeatureGates.Enabled(e2eutil.FeatureGateRecursive) { if util.FeatureGates.Enabled(util.FeatureGateRecursive) {
out, err := e2eutil.DockerCopy("/bin/", "/tmp/download-grpc-test").CombinedOutput() out, err := util.DockerCopy("/bin/", "/tmp/download-grpc-test").CombinedOutput()
if err != nil { if err != nil {
fmt.Println(string(out)) fmt.Println(string(out))
} }

36
test/e2e/manager/preheat.go
View File

@ -35,24 +35,24 @@ import (
"d7y.io/dragonfly/v2/manager/types" "d7y.io/dragonfly/v2/manager/types"
"d7y.io/dragonfly/v2/pkg/idgen" "d7y.io/dragonfly/v2/pkg/idgen"
"d7y.io/dragonfly/v2/pkg/structure" "d7y.io/dragonfly/v2/pkg/structure"
"d7y.io/dragonfly/v2/test/e2e/e2eutil" "d7y.io/dragonfly/v2/test/e2e/util"
) )
var _ = Describe("Preheat with manager", func() { var _ = Describe("Preheat with manager", func() {
Context("preheat", func() { Context("preheat", func() {
It("preheat files should be ok", Label("preheat", "file"), func() { It("preheat files should be ok", Label("preheat", "file"), func() {
var seedPeerPods [3]*e2eutil.PodExec var seedPeerPods [3]*util.PodExec
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
seedPeerPods[i] = getSeedPeerExec(i) seedPeerPods[i] = getSeedPeerExec(i)
} }
fsPod := getFileServerExec() fsPod := getFileServerExec()
for _, v := range e2eutil.GetFileList() { for _, v := range util.GetFileList() {
url := e2eutil.GetFileURL(v) url := util.GetFileURL(v)
fmt.Println("download url: " + url) fmt.Println("download url: " + url)
// get original file digest // get original file digest
out, err := e2eutil.DockerCommand("sha256sum", v).CombinedOutput() out, err := util.DockerCommand("sha256sum", v).CombinedOutput()
fmt.Println("original sha256sum: " + string(out)) fmt.Println("original sha256sum: " + string(out))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
sha256sum1 := strings.Split(string(out), " ")[0] sha256sum1 := strings.Split(string(out), " ")[0]
@ -104,7 +104,7 @@ var _ = Describe("Preheat with manager", func() {
} }
) )
var seedPeerPods [3]*e2eutil.PodExec var seedPeerPods [3]*util.PodExec
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
seedPeerPods[i] = getSeedPeerExec(i) seedPeerPods[i] = getSeedPeerExec(i)
} }
@ -140,7 +140,7 @@ var _ = Describe("Preheat with manager", func() {
}) })
It("preheat image for linux/amd64 platform should be ok", Label("preheat", "image"), func() { It("preheat image for linux/amd64 platform should be ok", Label("preheat", "image"), func() {
if !e2eutil.FeatureGates.Enabled(e2eutil.FeatureGatePreheatMultiArchImage) { if !util.FeatureGates.Enabled(util.FeatureGatePreheatMultiArchImage) {
fmt.Println("feature gate preheat multi arch image is disable, skip") fmt.Println("feature gate preheat multi arch image is disable, skip")
return return
} }
@ -165,7 +165,7 @@ var _ = Describe("Preheat with manager", func() {
} }
) )
var seedPeerPods [3]*e2eutil.PodExec var seedPeerPods [3]*util.PodExec
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
seedPeerPods[i] = getSeedPeerExec(i) seedPeerPods[i] = getSeedPeerExec(i)
} }
@ -202,7 +202,7 @@ var _ = Describe("Preheat with manager", func() {
}) })
It("preheat image for linux/arm64 platform should be ok", Label("preheat", "image"), func() { It("preheat image for linux/arm64 platform should be ok", Label("preheat", "image"), func() {
if !e2eutil.FeatureGates.Enabled(e2eutil.FeatureGatePreheatMultiArchImage) { if !util.FeatureGates.Enabled(util.FeatureGatePreheatMultiArchImage) {
fmt.Println("feature gate preheat multi arch image is disable, skip") fmt.Println("feature gate preheat multi arch image is disable, skip")
return return
} }
@ -227,7 +227,7 @@ var _ = Describe("Preheat with manager", func() {
} }
) )
var seedPeerPods [3]*e2eutil.PodExec var seedPeerPods [3]*util.PodExec
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
seedPeerPods[i] = getSeedPeerExec(i) seedPeerPods[i] = getSeedPeerExec(i)
} }
@ -265,7 +265,7 @@ var _ = Describe("Preheat with manager", func() {
}) })
}) })
func waitForDone(preheat *models.Job, pod *e2eutil.PodExec) bool { func waitForDone(preheat *models.Job, pod *util.PodExec) bool {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel() defer cancel()
@ -294,7 +294,7 @@ func waitForDone(preheat *models.Job, pod *e2eutil.PodExec) bool {
} }
} }
func checkPreheatResult(seedPeerPods [3]*e2eutil.PodExec, seedPeerTaskID string) (string, error) { func checkPreheatResult(seedPeerPods [3]*util.PodExec, seedPeerTaskID string) (string, error) {
var sha256sum string var sha256sum string
for _, seedPeer := range seedPeerPods { for _, seedPeer := range seedPeerPods {
taskDir := fmt.Sprintf("%s/%s", seedPeerDataPath, seedPeerTaskID) taskDir := fmt.Sprintf("%s/%s", seedPeerDataPath, seedPeerTaskID)
@ -320,23 +320,23 @@ func checkPreheatResult(seedPeerPods [3]*e2eutil.PodExec, seedPeerTaskID string)
} }
// getSeedPeerExec get seed peer pods // getSeedPeerExec get seed peer pods
func getSeedPeerExec(n int) *e2eutil.PodExec { func getSeedPeerExec(n int) *util.PodExec {
out, err := e2eutil.KubeCtlCommand("-n", dragonflyNamespace, "get", "pod", "-l", "component=seed-peer", out, err := util.KubeCtlCommand("-n", dragonflyNamespace, "get", "pod", "-l", "component=seed-peer",
"-o", fmt.Sprintf("jsonpath='{range .items[%d]}{.metadata.name}{end}'", n)).CombinedOutput() "-o", fmt.Sprintf("jsonpath='{range .items[%d]}{.metadata.name}{end}'", n)).CombinedOutput()
podName := strings.Trim(string(out), "'") podName := strings.Trim(string(out), "'")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
fmt.Println(podName) fmt.Println(podName)
Expect(strings.HasPrefix(podName, "dragonfly-seed-peer-")).Should(BeTrue()) Expect(strings.HasPrefix(podName, "dragonfly-seed-peer-")).Should(BeTrue())
return e2eutil.NewPodExec(dragonflyNamespace, podName, "seed-peer") return util.NewPodExec(dragonflyNamespace, podName, "seed-peer")
} }
// getFileServerExec get the file-server pod for curl // getFileServerExec get the file-server pod for curl
func getFileServerExec() *e2eutil.PodExec { func getFileServerExec() *util.PodExec {
out, err := e2eutil.KubeCtlCommand("-n", e2eNamespace, "get", "pod", "-l", "component=file-server", out, err := util.KubeCtlCommand("-n", e2eNamespace, "get", "pod", "-l", "component=file-server",
"-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput() "-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput()
podName := strings.Trim(string(out), "'") podName := strings.Trim(string(out), "'")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
fmt.Println(podName) fmt.Println(podName)
Expect(strings.HasPrefix(podName, "file-server-")).Should(BeTrue()) Expect(strings.HasPrefix(podName, "file-server-")).Should(BeTrue())
return e2eutil.NewPodExec(e2eNamespace, podName, "") return util.NewPodExec(e2eNamespace, podName, "")
} }

2
test/e2e/e2eutil/artifact.go → test/e2e/util/artifact.go
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package e2eutil package util
import ( import (
"fmt" "fmt"

2
test/e2e/e2eutil/exec.go → test/e2e/util/exec.go
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package e2eutil package util
import ( import (
"encoding/json" "encoding/json"

2
test/e2e/e2eutil/feature_gate.go → test/e2e/util/feature_gate.go
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package e2eutil package util
import "k8s.io/component-base/featuregate" import "k8s.io/component-base/featuregate"

2
test/e2e/e2eutil/file_server.go → test/e2e/util/file_server.go
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package e2eutil package util
import "fmt" import "fmt"