Skip to content

Remove CHAIN and I10R in favor of POGO #36

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
bobg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove CHAIN and I10R in favor of POGO #36

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
2 changes: 1 addition & 1 deletion cmd/testbot/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const usageString = `usage:
testbot onejob [sha] [dir] [name]

For onejob, sha is a git commit hash, dir is the location
of a Testfile relative to $I10R, and name is the name
of a Testfile relative to $POGO, and name is the name
of an entry in the Testfile.

Example:
Expand Down
5 changes: 2 additions & 3 deletions worker/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ func startJob(job testbot.Job) func() {
f.Seek(0, 0)
if s := scanError(f); s != "" && status != "success" {
s = strings.Replace(s, cmddir+"/", "", -1)
s = strings.Replace(s, repoDir+"/", "$I10R/", -1)
s = strings.Replace(s, repoDir+"/", "$POGO/", -1)
desc += ": " + s
}
f.Seek(0, 0)
Expand Down Expand Up @@ -411,8 +411,7 @@ func startJobProc(ctx context.Context, w io.Writer, job testbot.Job) (*exec.Cmd,
func prepareCommand(ctx context.Context, dir string, w io.Writer, cmd string) *exec.Cmd {
c := command(ctx, w, "/bin/bash", "-eo", "pipefail", "-c", cmd)
c.Env = append(os.Environ(),
"CHAIN="+repoDir,
"I10R="+repoDir,
"POGO="+repoDir,
"GOBIN="+binDir,
"NETLIFY_AUTH_TOKEN="+netlify,
"PATH="+binDir+":"+repoDir+"/bin:"+os.Getenv("PATH"),
Expand Down