Skip to content

Commit 03ed398

Browse files
danail-branekovgeorgethebeatle
authored andcommitted
Do not print failure debug info if suite setup failed
* Populate shared data guids gradually as resources are being created instead of setting random guids in advance * The debug info utlities check whether shared data guids are set and only produce output if they are Thus if the suite fails, we are not getting logs stating that given resource does not exist (provided that it has been never created) fixes #4094
1 parent 6e755a4 commit 03ed398

File tree

1 file changed

+42
-20
lines changed

1 file changed

+42
-20
lines changed

tests/smoke/suite_test.go

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,41 +71,50 @@ var _ = SynchronizedBeforeSuite(func() []byte {
7171
Expect(err).NotTo(HaveOccurred())
7272

7373
sharedData = SmokeTestSharedData{
74-
CfAdmin: uuid.NewString(),
75-
RootNamespace: helpers.GetDefaultedEnvVar("ROOT_NAMESPACE", "cf"),
76-
OrgName: uuid.NewString(),
77-
BrokerOrgName: uuid.NewString(),
78-
SpaceName: uuid.NewString(),
79-
AppsDomain: helpers.GetRequiredEnvVar("APP_FQDN"),
80-
BuildpackAppName: uuid.NewString(),
81-
DockerAppName: uuid.NewString(),
82-
FLockPath: filepath.Join(lockDir, "lock"),
74+
RootNamespace: helpers.GetDefaultedEnvVar("ROOT_NAMESPACE", "cf"),
75+
AppsDomain: helpers.GetRequiredEnvVar("APP_FQDN"),
76+
FLockPath: filepath.Join(lockDir, "lock"),
8377
}
8478
serviceAccountFactory := helpers.NewServiceAccountFactory(sharedData.RootNamespace)
8579

86-
cfAdminToken := serviceAccountFactory.CreateAdminServiceAccount(sharedData.CfAdmin)
87-
helpers.AddUserToKubeConfig(sharedData.CfAdmin, cfAdminToken)
80+
cfAdminUser := uuid.NewString()
81+
cfAdminToken := serviceAccountFactory.CreateAdminServiceAccount(cfAdminUser)
82+
helpers.AddUserToKubeConfig(cfAdminUser, cfAdminToken)
83+
sharedData.CfAdmin = cfAdminUser
8884

8985
Expect(helpers.Cf("api", helpers.GetRequiredEnvVar("API_SERVER_ROOT"), "--skip-ssl-validation")).To(Exit(0))
9086
Expect(helpers.Cf("auth", sharedData.CfAdmin)).To(Exit(0))
9187

88+
brokerOrgName := uuid.NewString()
89+
Expect(helpers.Cf("create-org", brokerOrgName)).To(Exit(0))
90+
sharedData.BrokerOrgName = brokerOrgName
91+
9292
brokerSpaceName := uuid.NewString()
93-
brokerAppName := uuid.NewString()
94-
Expect(helpers.Cf("create-org", sharedData.BrokerOrgName)).To(Exit(0))
9593
Expect(helpers.Cf("create-space", "-o", sharedData.BrokerOrgName, brokerSpaceName)).To(Exit(0))
9694
Expect(helpers.Cf("target", "-o", sharedData.BrokerOrgName, "-s", brokerSpaceName)).To(Exit(0))
95+
96+
brokerAppName := uuid.NewString()
9797
Expect(helpers.Cf("push", brokerAppName, "-p", "../assets/sample-broker")).To(Exit(0))
9898
sharedData.BrokerURL = helpers.GetInClusterURL(getAppGUID(brokerAppName))
9999

100-
Expect(helpers.Cf("create-org", sharedData.OrgName)).To(Exit(0))
101-
sharedData.OrgGUID, err = sessionOutput(helpers.Cf("org", sharedData.OrgName, "--guid"))
100+
orgName := uuid.NewString()
101+
Expect(helpers.Cf("create-org", orgName)).To(Exit(0))
102+
sharedData.OrgName = orgName
103+
sharedData.OrgGUID, err = sessionOutput(helpers.Cf("org", orgName, "--guid"))
102104
Expect(err).NotTo(HaveOccurred())
103105

104-
Expect(helpers.Cf("create-space", "-o", sharedData.OrgName, sharedData.SpaceName)).To(Exit(0))
105-
Expect(helpers.Cf("target", "-o", sharedData.OrgName, "-s", sharedData.SpaceName)).To(Exit(0))
106+
spaceName := uuid.NewString()
107+
Expect(helpers.Cf("create-space", "-o", sharedData.OrgName, spaceName)).To(Exit(0))
108+
Expect(helpers.Cf("target", "-o", sharedData.OrgName, "-s", spaceName)).To(Exit(0))
109+
sharedData.SpaceName = spaceName
110+
111+
buildpackAppName := uuid.NewString()
112+
Expect(helpers.Cf("push", buildpackAppName, "-p", "../assets/dorifi")).To(Exit(0))
113+
sharedData.BuildpackAppName = buildpackAppName
106114

107-
Expect(helpers.Cf("push", sharedData.BuildpackAppName, "-p", "../assets/dorifi")).To(Exit(0))
108-
Expect(helpers.Cf("push", sharedData.DockerAppName, "-o", "eirini/dorini")).To(Exit(0))
115+
dockerAppName := uuid.NewString()
116+
Expect(helpers.Cf("push", dockerAppName, "-o", "eirini/dorini")).To(Exit(0))
117+
sharedData.DockerAppName = dockerAppName
109118

110119
sharedDataBytes, err := json.Marshal(sharedData)
111120
Expect(err).NotTo(HaveOccurred())
@@ -187,15 +196,25 @@ func printCfApp(config *rest.Config) {
187196
return
188197
}
189198

199+
if sharedData.CfAdmin == "" {
200+
return
201+
}
190202
Expect(helpers.Cf("auth", sharedData.CfAdmin)).To(Exit(0))
203+
204+
if sharedData.SpaceName == "" {
205+
return
206+
}
191207
cfAppNamespace, err := sessionOutput(helpers.Cf("space", sharedData.SpaceName, "--guid"))
192208
if err != nil {
193209
fmt.Fprintf(GinkgoWriter, "failed to run 'cf space %s --guid': %v\n", sharedData.SpaceName, err)
194210
return
195211
}
212+
213+
if sharedData.BuildpackAppName == "" {
214+
return
215+
}
196216
cfAppGUID, err := sessionOutput(helpers.Cf("app", sharedData.BuildpackAppName, "--guid"))
197217
if err != nil {
198-
fmt.Fprintf(GinkgoWriter, "failed to run 'cf app %s --guid': %v\n", sharedData.BuildpackAppName, err)
199218
return
200219
}
201220

@@ -211,6 +230,9 @@ func printCfApp(config *rest.Config) {
211230
}
212231

213232
func printBuildLogs(config *rest.Config) {
233+
if sharedData.SpaceName == "" {
234+
return
235+
}
214236
spaceGUID, err := sessionOutput(helpers.Cf("space", sharedData.SpaceName, "--guid").Wait())
215237
if err != nil {
216238
fmt.Fprintf(GinkgoWriter, "failed to get space guid: %v\n", err)

0 commit comments

Comments
 (0)