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

feat: export e2e logs (#732) 

* feat: export e2e logs 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2021-10-15 10:58:07 +08:00
parent a87156a0bc
commit ad6697300b
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
6 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/compatibility-e2e.yml vendored
View File

@ -78,7 +78,11 @@ jobs:
- name: Upload Logs
uses: actions/upload-artifact@v2
if: failure()
if: always()
with:
name: ${{ matrix.module }}-compatibility-e2e-tests-logs
path: /tmp/artifact/
path: |
/tmp/artifact/manager/*.log
/tmp/artifact/daemon/*.log
/tmp/artifact/scheduler/*.log
/tmp/artifact/cdn/*.log

8
.github/workflows/e2e.yml vendored
View File

@ -67,7 +67,11 @@ jobs:
- name: Upload Logs
uses: actions/upload-artifact@v2
if: failure()
if: always()
with:
name: e2e-tests-logs
path: /tmp/artifact/
path: |
/tmp/artifact/manager/*.log
/tmp/artifact/daemon/*.log
/tmp/artifact/scheduler/*.log
/tmp/artifact/cdn/*.log

2
deploy/helm-charts

@ -1 +1 @@
Subproject commit 65abd2d1b046a20a47b6ae0e3c86f00160dafade
Subproject commit 3a576ac0752d4f956bb2feeb62180a703050b43d

22
test/e2e/e2e_test.go
View File

@ -77,28 +77,6 @@ var _ = BeforeSuite(func() {
Expect(gitCommit).To(Equal(dfgetGitCommit))
})
var _ = AfterSuite(func() {
out, err := e2eutil.KubeCtlCommand("-n", dragonflyNamespace, "get", "pod", "-l", "component=dfdaemon",
"-o", "jsonpath='{range .items[*]}{.metadata.name}{end}'").CombinedOutput()
podName := strings.Trim(string(out), "'")
Expect(err).NotTo(HaveOccurred())
Expect(strings.HasPrefix(podName, "dragonfly-dfdaemon-")).Should(BeTrue())
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, podName, "/var/log/dragonfly/daemon/core.log", "/tmp/artifact/daemon.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-0", "/var/log/dragonfly/manager/core.log", "/tmp/artifact/manager-0.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-0", "/var/log/dragonfly/manager/gin.log", "/tmp/artifact/manager-gin-0.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-1", "/var/log/dragonfly/manager/core.log", "/tmp/artifact/manager-1.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-1", "/var/log/dragonfly/manager/gin.log", "/tmp/artifact/manager-gin-1.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-2", "/var/log/dragonfly/manager/core.log", "/tmp/artifact/manager-2.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonlfy-manager-2", "/var/log/dragonfly/manager/gin.log", "/tmp/artifact/manager-gin-2.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-cdn-0", "/var/log/dragonfly/cdn/core.log", "/tmp/artifact/cdn-0.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-cdn-1", "/var/log/dragonfly/cdn/core.log", "/tmp/artifact/cdn-1.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-cdn-2", "/var/log/dragonfly/cdn/core.log", "/tmp/artifact/cdn-2.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-scheduler-0", "/var/log/dragonfly/scheduler/core.log", "/tmp/artifact/scheduler-0.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-scheduler-1", "/var/log/dragonfly/scheduler/core.log", "/tmp/artifact/scheduler-1.log").CombinedOutput()
e2eutil.KubeCtlCopyCommand(dragonflyNamespace, "dragonfly-scheduler-2", "/var/log/dragonfly/scheduler/core.log", "/tmp/artifact/scheduler-2.log").CombinedOutput()
})
// TestE2E is the root of e2e test function
func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)

28
test/testdata/charts/config.yaml vendored
View File

@ -1,14 +1,35 @@
scheduler:
image: d7yio/scheduler
tag: latest
extraVolumeMounts:
- name: logs
mountPath: "/var/log/dragonfly"
extraVolumes:
- name: logs
hostPath:
path: /tmp/artifact
cdn:
image: d7yio/cdn
tag: latest
extraVolumeMounts:
- name: logs
mountPath: "/var/log/dragonfly"
extraVolumes:
- name: logs
hostPath:
path: /tmp/artifact
dfdaemon:
image: d7yio/dfdaemon
tag: latest
extraVolumeMounts:
- name: logs
mountPath: "/var/log/dragonfly"
extraVolumes:
- name: logs
hostPath:
path: /tmp/artifact
config:
proxy:
defaultFilter: "Expires&Signature"
@ -29,3 +50,10 @@ dfdaemon:
manager:
image: d7yio/manager
tag: latest
extraVolumeMounts:
- name: logs
mountPath: "/var/log/dragonfly"
extraVolumes:
- name: logs
hostPath:
path: /tmp/artifact

8
test/testdata/kind/config.yaml vendored
View File

@ -10,3 +10,11 @@ nodes:
extraMounts:
- hostPath: ./test/testdata/containerd/config.toml
containerPath: /etc/containerd/config.toml
- hostPath: /tmp/artifact/manager
containerPath: /tmp/artifact/manager
- hostPath: /tmp/artifact/daemon
containerPath: /tmp/artifact/daemon
- hostPath: /tmp/artifact/scheduler
containerPath: /tmp/artifact/scheduler
- hostPath: /tmp/artifact/cdn
containerPath: /tmp/artifact/cdn