Skip to content

Commit cb2547f

Browse files
Merge pull request #20563 from gabemontero/ext-tst-gcp-prow-diag
info/diag for direct ext test invocation on gcp/prow
2 parents aa0979c + 9f791b0 commit cb2547f

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
lines changed

Diff for: test/extended/builds/pipeline.go

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package builds
33
import (
44
"errors"
55
"fmt"
6+
"io/ioutil"
67
"net/http"
78
"net/url"
89
"os"
@@ -810,6 +811,16 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
810811
g.By(fmt.Sprintf("creating git repo %v", envVarsPipelineGitRepoBuildConfig))
811812
repo, err := exutil.NewGitRepo(envVarsPipelineGitRepoBuildConfig)
812813
defer repo.Remove()
814+
if err != nil {
815+
files, dbgerr := ioutil.ReadDir("/tmp")
816+
if dbgerr != nil {
817+
e2e.Logf("problem diagnosing /tmp: %v", dbgerr)
818+
} else {
819+
for _, file := range files {
820+
e2e.Logf("found file %s under temp isdir %q mode %s", file.Name(), file.IsDir(), file.Mode().String())
821+
}
822+
}
823+
}
813824
o.Expect(err).NotTo(o.HaveOccurred())
814825
jf := `node() {\necho "FOO1 is ${env.FOO1}"\necho"FOO2is${env.FOO2}"\necho"FOO3is${env.FOO3}"\necho"FOO4is${env.FOO4}"}`
815826
err = repo.AddAndCommit("Jenkinsfile", jf)

Diff for: test/extended/util/cli.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,27 @@ func NewCLI(project, adminConfigPath string) *CLI {
8585

8686
g.BeforeEach(client.SetupProject)
8787

88-
ProwGCPSetup(client)
89-
9088
return client
9189
}
9290

9391
// ProwGCPSetup makes sure certain required env vars are available in the case
9492
// that extended tests are invoked directly via calls to ginkgo/extended.test
9593
func ProwGCPSetup(oc *CLI) {
9694
tn := os.Getenv("OS_TEST_NAMESPACE")
95+
ad := os.Getenv("ARTIFACT_DIR")
96+
btd := os.Getenv("BASETMPDIR")
97+
e2e.Logf("OS_TEST_NAMESPACE env setting %s, ARTIFACT_DIR env setting %s BASETMPDIR %s", tn, ad, btd)
9798
if len(strings.TrimSpace(tn)) == 0 {
9899
os.Setenv("OS_TEST_NAMESPACE", oc.Namespace())
100+
e2e.Logf("OS_TEST_NAMESPACE env setting now %s", os.Getenv("OS_TEST_NAMESPACE"))
99101
}
100-
ad := os.Getenv("ARTIFACT_DIR")
101102
if len(strings.TrimSpace(ad)) == 0 {
102103
os.Setenv("ARTIFACT_DIR", "/tmp/artifacts")
104+
e2e.Logf("ARTIFACT_DIR env setting now %s", os.Getenv("ARTIFACT_DIR"))
105+
}
106+
if len(strings.TrimSpace(btd)) == 0 {
107+
os.Setenv("BASETMPDIR", "/tmp/shared")
108+
e2e.Logf("BASETMPDIR setting is now %s", os.Getenv("BASETMPDIR"))
103109
}
104110

105111
}
@@ -176,6 +182,7 @@ func (c *CLI) SetupProject() {
176182
newNamespace := names.SimpleNameGenerator.GenerateName(fmt.Sprintf("e2e-test-%s-", c.kubeFramework.BaseName))
177183
c.SetNamespace(newNamespace).ChangeUser(fmt.Sprintf("%s-user", newNamespace))
178184
e2e.Logf("The user is now %q", c.Username())
185+
ProwGCPSetup(c)
179186

180187
e2e.Logf("Creating project %q", newNamespace)
181188
_, err := c.ProjectClient().Project().ProjectRequests().Create(&projectapi.ProjectRequest{

Diff for: test/extended/util/jenkins/ref.go

+11
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,17 @@ func (j *JenkinsRef) ProcessJenkinsJobUsingVars(filename, namespace string, vars
264264
o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())
265265

266266
newfile, err := exutil.CreateTempFile(string(data))
267+
e2e.Logf("new temp file %s err %v", newfile, err)
268+
if err != nil {
269+
files, dbgerr := ioutil.ReadDir("/tmp")
270+
if dbgerr != nil {
271+
e2e.Logf("problem diagnosing /tmp: %v", dbgerr)
272+
} else {
273+
for _, file := range files {
274+
e2e.Logf("found file %s under temp isdir %q mode %s", file.Name(), file.IsDir(), file.Mode().String())
275+
}
276+
}
277+
}
267278
o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())
268279
return newfile
269280

0 commit comments

Comments
 (0)