Skip to content
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

extended tests: use leaner repo for contextdir test #20090

Merged
merged 1 commit into from
Jul 6, 2018
Merged

extended tests: use leaner repo for contextdir test #20090

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions test/extended/builds/contextdir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,20 @@ var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", fun

g.Describe("docker context directory build", func() {
g.It(fmt.Sprintf("should docker build an application using a context directory"), func() {
g.By("initializing local repo")
repo, err := exutil.NewGitRepo("contextdir")
o.Expect(err).NotTo(o.HaveOccurred())
defer repo.Remove()
err = repo.AddAndCommit("2.3/Dockerfile", "FROM busybox")
o.Expect(err).NotTo(o.HaveOccurred())

exutil.CheckOpenShiftNamespaceImageStreams(oc)
g.By(fmt.Sprintf("calling oc create -f %q", appFixture))
err := oc.Run("create").Args("-f", appFixture).Execute()
err = oc.Run("create").Args("-f", appFixture).Execute()
o.Expect(err).NotTo(o.HaveOccurred())

g.By("starting a build")
err = oc.Run("start-build").Args(dockerBuildConfigName).Execute()
err = oc.Run("start-build").Args(dockerBuildConfigName, "--from-repo", repo.RepoPath).Execute()
o.Expect(err).NotTo(o.HaveOccurred())

// build will fail if we don't use the right context dir because there won't be a dockerfile present.
Expand Down
9 changes: 4 additions & 5 deletions test/extended/testdata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions test/extended/testdata/builds/test-context-build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
"spec": {
"triggers": [],
"source": {
"type": "Git",
"git": {
"uri":"https://github.com/sclorg/s2i-ruby-container"
},
"type": "binary",
"binary": {},
"contextDir": "2.3"
},
"strategy": {
Expand Down Expand Up @@ -152,4 +150,4 @@
}
}
]
}
}
4 changes: 4 additions & 0 deletions test/extended/util/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,6 +1327,10 @@ type GitRepo struct {

// AddAndCommit commits a file with its content to local repo
func (r GitRepo) AddAndCommit(file, content string) error {
dir := filepath.Dir(file)
if err := os.MkdirAll(filepath.Join(r.RepoPath, dir), 0777); err != nil {
return err
}
if err := ioutil.WriteFile(filepath.Join(r.RepoPath, file), []byte(content), 0666); err != nil {
return err
}
Expand Down