Skip to content

Commit a62932a

Browse files
fmoral2fmoral2
authored
Jjb qase.summary (rancher#264)
 Signed-off-by: Francisco <francisco.moral@suse.com>
1 parent 78ad3dc commit a62932a

48 files changed

Lines changed: 1215 additions & 330 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,5 @@ issues:
9696
text: 'continue with no blank line before'
9797
- linters: [revive]
9898
text: 'should not use dot imports '
99+
- linters: [ revive ]
100+
text: 'Unhandled error in call to function strings\.Builder\.WriteString'

‎cmd/qase/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func main() {
3434
os.Exit(1)
3535
}
3636

37-
reportErr := qaseClient.ReportRun(fileName, product)
37+
reportErr := qaseClient.ReportE2ETestRun(fileName, product)
3838
if reportErr != nil {
3939
shared.LogLevel("error", "error reporting test data to qase: %w\n", reportErr)
4040
os.Exit(1)

‎entrypoint/airgap/airgap_suite_test.go‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ import (
1616
)
1717

1818
var (
19-
qaseReport = os.Getenv("REPORT_TO_QASE")
20-
flags *customflag.FlagConfig
21-
cluster *shared.Cluster
22-
cfg *config.Env
23-
err error
19+
qaseReport = os.Getenv("REPORT_TO_QASE")
20+
flags *customflag.FlagConfig
21+
cluster *shared.Cluster
22+
cfg *config.Env
23+
reportSummary string
24+
reportErr error
25+
err error
2426
)
2527

2628
func TestMain(m *testing.M) {
@@ -103,13 +105,18 @@ var _ = ReportAfterSuite("Create Airgap Cluster Test Suite", func(report Report)
103105
qaseClient, err := qase.AddQase()
104106
Expect(err).ToNot(HaveOccurred(), "error adding qase")
105107

106-
qaseClient.SpecReportTestResults(qaseClient.Ctx, &report, cfg.InstallVersion)
108+
qaseClient.SpecReportTestResults(qaseClient.Ctx, cluster, &report, reportSummary)
107109
} else {
108110
shared.LogLevel("info", "Qase reporting is not enabled")
109111
}
110112
})
111113

112114
var _ = AfterSuite(func() {
115+
reportSummary, reportErr = shared.SummaryReportData(cluster, flags)
116+
if reportErr != nil {
117+
shared.LogLevel("error", "error getting report summary data: %v\n", reportErr)
118+
}
119+
113120
if customflag.ServiceFlag.Destroy {
114121
status, err := shared.DestroyCluster(cfg)
115122
Expect(err).NotTo(HaveOccurred())

‎entrypoint/certrotate/certrotate_suite_test.go‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,19 @@ import (
1616
)
1717

1818
var (
19-
qaseReport = os.Getenv("REPORT_TO_QASE")
20-
kubeconfig string
21-
cluster *shared.Cluster
22-
cfg *config.Env
23-
err error
19+
qaseReport = os.Getenv("REPORT_TO_QASE")
20+
flags *customflag.FlagConfig
21+
kubeconfig string
22+
cluster *shared.Cluster
23+
cfg *config.Env
24+
reportSummary string
25+
reportErr error
26+
err error
2427
)
2528

2629
func TestMain(m *testing.M) {
27-
flag.Var(&customflag.ServiceFlag.Destroy, "destroy", "Destroy cluster after test")
30+
flags = &customflag.ServiceFlag
31+
flag.Var(&flags.Destroy, "destroy", "Destroy cluster after test")
2832
flag.Parse()
2933

3034
cfg, err = config.AddEnv()
@@ -56,13 +60,18 @@ var _ = ReportAfterSuite("Certificate Rotate Test Suite", func(report Report) {
5660
qaseClient, err := qase.AddQase()
5761
Expect(err).ToNot(HaveOccurred(), "error adding qase")
5862

59-
qaseClient.SpecReportTestResults(qaseClient.Ctx, &report, cfg.InstallVersion)
63+
qaseClient.SpecReportTestResults(qaseClient.Ctx, cluster, &report, reportSummary)
6064
} else {
6165
shared.LogLevel("info", "Qase reporting is not enabled")
6266
}
6367
})
6468

6569
var _ = AfterSuite(func() {
70+
reportSummary, reportErr = shared.SummaryReportData(cluster, flags)
71+
if reportErr != nil {
72+
shared.LogLevel("error", "error getting report summary data: %v\n", reportErr)
73+
}
74+
6675
if customflag.ServiceFlag.Destroy {
6776
status, err := shared.DestroyCluster(cfg)
6877
Expect(err).NotTo(HaveOccurred())

‎entrypoint/clusterreset/clusterreset_suite_test.go‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,18 @@ import (
1616
)
1717

1818
var (
19-
qaseReport = os.Getenv("REPORT_TO_QASE")
20-
kubeconfig string
21-
cluster *shared.Cluster
22-
cfg *config.Env
23-
err error
19+
qaseReport = os.Getenv("REPORT_TO_QASE")
20+
flags *customflag.FlagConfig
21+
kubeconfig string
22+
cluster *shared.Cluster
23+
cfg *config.Env
24+
reportSummary string
25+
reportErr error
26+
err error
2427
)
2528

2629
func TestMain(m *testing.M) {
27-
flag.Var(&customflag.ServiceFlag.Destroy, "destroy", "Destroy cluster after test")
30+
flag.Var(&flags.Destroy, "destroy", "Destroy cluster after test")
2831
flag.Parse()
2932

3033
cfg, err = config.AddEnv()
@@ -56,13 +59,18 @@ var _ = ReportAfterSuite("Cluster Reset Test Suite", func(report Report) {
5659
qaseClient, err := qase.AddQase()
5760
Expect(err).ToNot(HaveOccurred(), "error adding qase")
5861

59-
qaseClient.SpecReportTestResults(qaseClient.Ctx, &report, cfg.InstallVersion)
62+
qaseClient.SpecReportTestResults(qaseClient.Ctx, cluster, &report, reportSummary)
6063
} else {
6164
shared.LogLevel("info", "Qase reporting is not enabled")
6265
}
6366
})
6467

6568
var _ = AfterSuite(func() {
69+
reportSummary, reportErr = shared.SummaryReportData(cluster, flags)
70+
if reportErr != nil {
71+
shared.LogLevel("error", "error getting report summary data: %v\n", reportErr)
72+
}
73+
6674
if customflag.ServiceFlag.Destroy {
6775
status, err := shared.DestroyCluster(cfg)
6876
Expect(err).NotTo(HaveOccurred())

‎entrypoint/clusterrestore/clusterrestore_suite_test.go‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ import (
1717
)
1818

1919
var (
20-
qaseReport = os.Getenv("REPORT_TO_QASE")
21-
flags *customflag.FlagConfig
22-
kubeconfig string
23-
cfg *config.Env
24-
cluster *shared.Cluster
25-
awsClient *aws.Client
20+
qaseReport = os.Getenv("REPORT_TO_QASE")
21+
flags *customflag.FlagConfig
22+
kubeconfig string
23+
cfg *config.Env
24+
cluster *shared.Cluster
25+
reportSummary string
26+
reportErr error
27+
awsClient *aws.Client
2628
)
2729

2830
func TestMain(m *testing.M) {
@@ -67,13 +69,16 @@ func TestClusterResetRestoreSuite(t *testing.T) {
6769
}
6870

6971
var _ = AfterSuite(func() {
72+
reportSummary, reportErr = shared.SummaryReportData(cluster, flags)
73+
if reportErr != nil {
74+
shared.LogLevel("error", "error getting report summary data: %v\n", reportErr)
75+
}
76+
7077
if customflag.ServiceFlag.Destroy {
7178
status, err := shared.DestroyCluster(cfg)
7279
Expect(err).NotTo(HaveOccurred())
7380
Expect(status).To(Equal("cluster destroyed"))
7481
}
75-
76-
cleanS3Snapshot()
7782
})
7883

7984
var _ = ReportAfterSuite("Cluster Reset Restore Test Suite", func(report Report) {
@@ -82,7 +87,7 @@ var _ = ReportAfterSuite("Cluster Reset Restore Test Suite", func(report Report)
8287
qaseClient, err := qase.AddQase()
8388
Expect(err).ToNot(HaveOccurred(), "error adding qase")
8489

85-
qaseClient.SpecReportTestResults(qaseClient.Ctx, &report, cfg.InstallVersion)
90+
qaseClient.SpecReportTestResults(qaseClient.Ctx, cluster, &report, reportSummary)
8691
} else {
8792
shared.LogLevel("info", "Qase reporting is not enabled")
8893
}
@@ -103,12 +108,3 @@ func checkUnsupportedFlags() {
103108
os.Exit(1)
104109
}
105110
}
106-
107-
func cleanS3Snapshot() {
108-
shared.LogLevel("info", "cleaning s3 snapshots")
109-
110-
err := awsClient.DeleteS3Object(customflag.ServiceFlag.S3Flags.Bucket, customflag.ServiceFlag.S3Flags.Folder)
111-
if err != nil {
112-
shared.LogLevel("error", "error deleting object: %v", err)
113-
}
114-
}

‎entrypoint/conformance/conformance_suite_test.go‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ import (
1717
)
1818

1919
var (
20-
qaseReport = os.Getenv("REPORT_TO_QASE")
21-
kubeconfig string
22-
cluster *shared.Cluster
23-
flags *customflag.FlagConfig
24-
cfg *config.Env
25-
err error
20+
qaseReport = os.Getenv("REPORT_TO_QASE")
21+
kubeconfig string
22+
cluster *shared.Cluster
23+
flags *customflag.FlagConfig
24+
cfg *config.Env
25+
reportSummary string
26+
reportErr error
27+
err error
2628
)
2729

2830
func TestMain(m *testing.M) {
@@ -62,13 +64,18 @@ var _ = ReportAfterSuite("Conformance Suite", func(report Report) {
6264
qaseClient, err := qase.AddQase()
6365
Expect(err).ToNot(HaveOccurred(), "error adding qase")
6466

65-
qaseClient.SpecReportTestResults(qaseClient.Ctx, &report, cfg.InstallVersion)
67+
qaseClient.SpecReportTestResults(qaseClient.Ctx, cluster, &report, reportSummary)
6668
} else {
6769
shared.LogLevel("info", "Qase reporting is not enabled")
6870
}
6971
})
7072

7173
var _ = AfterSuite(func() {
74+
reportSummary, reportErr = shared.SummaryReportData(cluster, flags)
75+
if reportErr != nil {
76+
shared.LogLevel("error", "error getting report summary data: %v\n", reportErr)
77+
}
78+
7279
if customflag.ServiceFlag.Destroy {
7380
status, err := shared.DestroyCluster(cfg)
7481
Expect(err).NotTo(HaveOccurred())

‎entrypoint/deployrancher/rancher_suite_test.go‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ import (
1616
)
1717

1818
var (
19-
qaseReport = os.Getenv("REPORT_TO_QASE")
20-
cluster *shared.Cluster
21-
flags *customflag.FlagConfig
22-
kubeconfig string
23-
cfg *config.Env
24-
err error
19+
qaseReport = os.Getenv("REPORT_TO_QASE")
20+
cluster *shared.Cluster
21+
flags *customflag.FlagConfig
22+
kubeconfig string
23+
cfg *config.Env
24+
reportSummary string
25+
reportErr error
26+
err error
2527
)
2628

2729
func TestMain(m *testing.M) {
@@ -115,13 +117,18 @@ var _ = ReportAfterSuite("Deploy Rancher Manager Test Suite", func(report Report
115117
qaseClient, err := qase.AddQase()
116118
Expect(err).ToNot(HaveOccurred(), "error adding qase")
117119

118-
qaseClient.SpecReportTestResults(qaseClient.Ctx, &report, cfg.InstallVersion)
120+
qaseClient.SpecReportTestResults(qaseClient.Ctx, cluster, &report, reportSummary)
119121
} else {
120122
shared.LogLevel("info", "Qase reporting is not enabled")
121123
}
122124
})
123125

124126
var _ = AfterSuite(func() {
127+
reportSummary, reportErr = shared.SummaryReportData(cluster, flags)
128+
if reportErr != nil {
129+
shared.LogLevel("error", "error getting report summary data: %v\n", reportErr)
130+
}
131+
125132
if customflag.ServiceFlag.Destroy {
126133
status, err := shared.DestroyCluster(cfg)
127134
Expect(err).NotTo(HaveOccurred())

‎entrypoint/dualstack/dualstack_suite_test.go‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,19 @@ import (
1616
)
1717

1818
var (
19-
qaseReport = os.Getenv("REPORT_TO_QASE")
20-
kubeconfig string
21-
cluster *shared.Cluster
22-
cfg *config.Env
23-
err error
19+
qaseReport = os.Getenv("REPORT_TO_QASE")
20+
flags *customflag.FlagConfig
21+
kubeconfig string
22+
cluster *shared.Cluster
23+
cfg *config.Env
24+
reportSummary string
25+
reportErr error
26+
err error
2427
)
2528

2629
func TestMain(m *testing.M) {
27-
flag.Var(&customflag.ServiceFlag.Destroy, "destroy", "Destroy cluster after test")
30+
flags = &customflag.ServiceFlag
31+
flag.Var(&flags.Destroy, "destroy", "Destroy cluster after test")
2832
flag.Parse()
2933

3034
cfg, err = config.AddEnv()
@@ -56,13 +60,18 @@ var _ = ReportAfterSuite("Create Dual-Stack Cluster Test Suite", func(report Rep
5660
qaseClient, err := qase.AddQase()
5761
Expect(err).ToNot(HaveOccurred(), "error adding qase")
5862

59-
qaseClient.SpecReportTestResults(qaseClient.Ctx, &report, cfg.InstallVersion)
63+
qaseClient.SpecReportTestResults(qaseClient.Ctx, cluster, &report, reportSummary)
6064
} else {
6165
shared.LogLevel("info", "Qase reporting is not enabled")
6266
}
6367
})
6468

6569
var _ = AfterSuite(func() {
70+
reportSummary, reportErr = shared.SummaryReportData(cluster, flags)
71+
if reportErr != nil {
72+
shared.LogLevel("error", "error getting report summary data: %v\n", reportErr)
73+
}
74+
6675
if customflag.ServiceFlag.Destroy {
6776
status, err := shared.DestroyCluster(cfg)
6877
Expect(err).NotTo(HaveOccurred())

‎entrypoint/ipv6only/ipv6only_suite_test.go‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@ import (
1717
)
1818

1919
var (
20-
qaseReport = os.Getenv("REPORT_TO_QASE")
21-
kubeconfig string
22-
cluster *shared.Cluster
23-
cfg *config.Env
24-
err error
25-
awsClient *aws.Client
20+
qaseReport = os.Getenv("REPORT_TO_QASE")
21+
flags *customflag.FlagConfig
22+
kubeconfig string
23+
cluster *shared.Cluster
24+
cfg *config.Env
25+
err error
26+
reportSummary string
27+
reportErr error
28+
awsClient *aws.Client
2629
)
2730

2831
func TestMain(m *testing.M) {
29-
flag.Var(&customflag.ServiceFlag.Destroy, "destroy", "Destroy cluster after test")
32+
flags = &customflag.ServiceFlag
33+
flag.Var(&flags.Destroy, "destroy", "Destroy cluster after test")
3034
flag.Parse()
3135

3236
cfg, err = config.AddEnv()
@@ -64,13 +68,18 @@ var _ = ReportAfterSuite("Create IPv6 Only Cluster Test Suite", func(report Repo
6468
qaseClient, err := qase.AddQase()
6569
Expect(err).ToNot(HaveOccurred(), "error adding qase")
6670

67-
qaseClient.SpecReportTestResults(qaseClient.Ctx, &report, cfg.InstallVersion)
71+
qaseClient.SpecReportTestResults(qaseClient.Ctx, cluster, &report, reportSummary)
6872
} else {
6973
shared.LogLevel("info", "Qase reporting is not enabled")
7074
}
7175
})
7276

7377
var _ = AfterSuite(func() {
78+
reportSummary, reportErr = shared.SummaryReportData(cluster, flags)
79+
if reportErr != nil {
80+
shared.LogLevel("error", "error getting report summary data: %v\n", reportErr)
81+
}
82+
7483
if customflag.ServiceFlag.Destroy {
7584
status, err := shared.DestroyCluster(cfg)
7685
Expect(err).NotTo(HaveOccurred())

0 commit comments

Comments
 (0)