Skip to content

feat: Add tests for redhat-developer/gitops-must-gather#51 #1375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olivergondza wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Add tests for redhat-developer/gitops-must-gather#51 #1375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions test/openshift/e2e/ginkgo/sequential/1-120_validate_running_must_gather.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,8 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
Expect(path.Join(csr, "config.openshift.io/clusterversions/version.yaml")).To(BeValidResourceFile())

n := path.Join(resources, "namespaces")
Expect(n).To(BeADirectory())
Expect(path.Join(n, "openshift-gitops/openshift-gitops.yaml")).To(BeValidResourceFile())
Expect(path.Join(n, "openshift-gitops/route.openshift.io/routes.yaml")).To(BeValidResourceFile())
Expect(path.Join(n, "openshift-gitops/argoproj.io/appprojects.yaml")).To(BeValidResourceFile())
logs := path.Join(n, "openshift-gitops/pods/openshift-gitops-application-controller-0/argocd-application-controller/argocd-application-controller/logs/")
Expect(path.Join(logs, "current.log")).To(BeARegularFile())
Expect(path.Join(logs, "previous.log")).To(BeARegularFile())
assertNamespaceLogs(n, "openshift-gitops", "openshift-gitops")
assertNamespaceLogs(n, ns.Name, "left-argocd")

Expect(path.Join(n, nsf.Name, "core/pods.yaml")).To(BeValidResourceFile())
})
Expand Down Expand Up @@ -157,6 +152,29 @@ func resourcesDir(destDir string) string {
return path.Join(destDir, subdirs[0])
}

// assertNamespaceLogs checks must-gather output for an Argo CD instance named the same as namespace.
// On failure, the message lists every file under namespacesDir.
func assertNamespaceLogs(namespacesDir, namespace string, instanceName string) {
Expect(namespacesDir).To(BeADirectory())

base := path.Join(namespacesDir, namespace)
Expect(path.Join(base, namespace+".yaml")).To(BeValidResourceFile())
Expect(path.Join(base, "route.openshift.io/routes.yaml")).To(BeValidResourceFile())
Expect(path.Join(base, "argoproj.io/appprojects.yaml")).To(BeValidResourceFile())
Expect(path.Join(base, "core/pods.yaml")).To(BeValidResourceFile())
// Test roles and rolebindings as they are collected separately
Expect(path.Join(base, "rbac.authorization.k8s.io/roles/"+instanceName+"-argocd-server.yaml")).To(BeValidResourceFile())
Expect(path.Join(base, "rbac.authorization.k8s.io/rolebindings/"+instanceName+"-argocd-server.yaml")).To(BeValidResourceFile())

podLogs := path.Join(
base, "pods", instanceName+"-application-controller-0",
"argocd-application-controller", "argocd-application-controller", "logs",
)
Expect(path.Join(podLogs, "current.log")).To(BeARegularFile())
Expect(path.Join(podLogs, "previous.log")).To(BeARegularFile())

}

func mustGatherImage() string {
injected := os.Getenv("E2E_MUST_GATHER_IMAGE")
if injected == "" {
Expand Down
Loading