Skip to content

Commit

Permalink
dashboard: rearrange tree, in prep for packagification
Browse files Browse the repository at this point in the history
Package main binaries now go under cmd, leaving the top level for
similarly-named packages.

I'll be moving a lot of data structures and functions out of the
commands and into common packages.

A future CL will also unify all the "+build whatever" restrictions
into one common build tag, since there will be so much package sharing
coming up. Probably they will become "+build extdep", to indicate that
they have dependencies outside of x/tools.

Change-Id: Idc198e0dfa933b5f5de8f2b581533e8d299d2293
Reviewed-on: https://go-review.googlesource.com/2738
Reviewed-by: Andrew Gerrand <adg@golang.org>
  • Loading branch information
bradfitz committed Jan 15, 2015
1 parent 9f20d8c commit e83451b
Show file tree
Hide file tree
Showing 31 changed files with 30 additions and 149 deletions.
5 changes: 1 addition & 4 deletions .gitignore
@@ -1,5 +1,2 @@
# Add no patterns to .hgignore except for files generated by the build.
# Add no patterns to .gitignore except for files generated by the build.
last-change
dashboard/coordinator/buildongce/client-*.dat
dashboard/coordinator/buildongce/token.dat
dashboard/coordinator/coordinator
29 changes: 19 additions & 10 deletions dashboard/README
Expand Up @@ -4,28 +4,37 @@

The files in these directories constitute the continuous builder:

app/: a.k.a the "dashboard"; the App Engine code that runs http://build.golang.org/
buildlet/: HTTP server that runs on a VM and is told what to write to disk
app/: a.k.a the "dashboard"; the App Engine code that runs http://build.golang.org/

cmd/:

buildlet/: HTTP server that runs on a VM and is told what to write to disk
and what command to run. This is cross-compiled to different architectures
and is the first program run when a builder VM comes up. It then
is contacted by the coordinator to do a build. Not all builders use
the buildlet (at least not yet).
builder/: gobuilder, a Go continuous build client. The original Go builder program.
coordinator/: daemon that runs on CoreOS on Google Compute Engine and manages

builder/: gobuilder, a Go continuous build client. The original Go builder program.

coordinator/: daemon that runs on CoreOS on Google Compute Engine and manages
builds using Docker containers and/or VMs as needed.

retrybuilds/: a Go client program to delete build results from the dashboard (app)

upload/: a Go program to upload to Google Cloud Storage. used by Makefiles elsewhere.

watcher/: a daemon that watches for new commits to the Go repository and
its sub-repositories, and notifies the dashboard of those commits.

env/: configuration files describing the environment of builders and related
binaries. Many builders are still configured ad-hoc, without a hermetic
environment.
retrybuilds/: a Go client program to delete build results from the dashboard (app)

types/: a Go package contain common types used by other pieces.
upload/: a Go program to upload to Google Cloud Storage. used by Makefiles elsewhere.
watcher/: a daemon that watches for new commits to the Go repository and
its sub-repositories, and notifies the dashboard of those commits.


If you wish to run a Go builder, please email golang-dev@googlegroups.com first.
There is documentation at https://golang.org/wiki/DashboardBuilders but
depending on the type of builder, we may want to run it ourselves, after you
prepare an environment description (resulting in a VM image) of it. See the env
directory.


File renamed without changes.
2 changes: 1 addition & 1 deletion dashboard/builder/doc.go → dashboard/cmd/builder/doc.go
Expand Up @@ -55,4 +55,4 @@ If the Google Code credentials are not provided the archival step
will be skipped.
*/
package main // import "golang.org/x/tools/dashboard/builder"
package main // import "golang.org/x/tools/dashboard/cmd/builder"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions dashboard/cmd/coordinator/.gitignore
@@ -0,0 +1,3 @@
buildongce/client-*.dat
buildongce/token.dat
coordinator
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion dashboard/env/commit-watcher/Makefile
Expand Up @@ -6,4 +6,4 @@ docker: Dockerfile
docker build -t go-commit-watcher .

docker-commit-watcher.tar.gz: docker
docker save go-commit-watcher | gzip | (cd ../../upload && go run upload.go --public go-builder-data/docker-commit-watcher.tar.gz)
docker save go-commit-watcher | gzip | (cd ../../cmd/upload && go run upload.go --public go-builder-data/docker-commit-watcher.tar.gz)
2 changes: 1 addition & 1 deletion dashboard/env/linux-x86-base/Makefile
Expand Up @@ -6,7 +6,7 @@ docker: Dockerfile
docker build -t gobuilders/linux-x86-base .

docker-linux.base.tar.gz: docker
docker save gobuilders/linux-x86-base | gzip | (cd ../../upload && go run upload.go --public go-builder-data/docker-linux.base.tar.gz)
docker save gobuilders/linux-x86-base | gzip | (cd ../../cmd/upload && go run upload.go --public go-builder-data/docker-linux.base.tar.gz)

check: docker
docker run -e GOROOT_BOOTSTRAP=/go1.4-amd64/go gobuilders/linux-x86-base /usr/local/bin/builder -rev=20a10e7ddd1 -buildroot=/ -v -report=false linux-amd64-temp
Expand Down
2 changes: 1 addition & 1 deletion dashboard/env/linux-x86-clang/Makefile
Expand Up @@ -6,7 +6,7 @@ docker: Dockerfile
docker build -t gobuilders/linux-x86-clang .

docker-linux.clang.tar.gz: docker
docker save gobuilders/linux-x86-clang | gzip | (cd ../../upload && go run upload.go --public go-builder-data/docker-linux.clang.tar.gz)
docker save gobuilders/linux-x86-clang | gzip | (cd ../../cmd/upload && go run upload.go --public go-builder-data/docker-linux.clang.tar.gz)

check: docker
docker run -e GOROOT_BOOTSTRAP=/go1.4-amd64/go gobuilders/linux-x86-clang /usr/local/bin/builder -rev=20a10e7ddd1b -buildroot=/ -v -report=false linux-amd64-temp
Expand Down
2 changes: 1 addition & 1 deletion dashboard/env/linux-x86-gccgo/Makefile
Expand Up @@ -6,7 +6,7 @@ docker: Dockerfile
docker build -t gobuilders/linux-x86-gccgo .

docker-linux.gccgo.tar.gz: docker
docker save gobuilders/linux-x86-gccgo | gzip | (cd ../../upload && go run upload.go --public go-builder-data/docker-linux.gccgo.tar.gz)
docker save gobuilders/linux-x86-gccgo | gzip | (cd ../../cmd/upload && go run upload.go --public go-builder-data/docker-linux.gccgo.tar.gz)

check: docker
docker run gobuilders/linux-x86-gccgo /usr/local/bin/builder -tool="gccgo" -rev=b9151e911a54 -v -cmd='make RUNTESTFLAGS="--target_board=unix/-m64" check-go' -report=false linux-amd64-gccgo-temp
Expand Down
2 changes: 1 addition & 1 deletion dashboard/env/linux-x86-nacl/Makefile
Expand Up @@ -6,7 +6,7 @@ docker: Dockerfile
docker build -t gobuilders/linux-x86-nacl .

upload: docker
docker save gobuilders/linux-x86-nacl | gzip | (cd ../../upload && go run upload.go --public go-builder-data/docker-linux.nacl.tar.gz)
docker save gobuilders/linux-x86-nacl | gzip | (cd ../../cmd/upload && go run upload.go --public go-builder-data/docker-linux.nacl.tar.gz)

check: docker
docker run gobuilders/linux-x86-nacl /usr/local/bin/builder -rev=77e96c9208d0 -buildroot=/ -v -cmd=/usr/local/bin/build-command.pl -report=false nacl-amd64p32
2 changes: 1 addition & 1 deletion dashboard/env/linux-x86-sid/Makefile
Expand Up @@ -6,7 +6,7 @@ docker: Dockerfile
docker build -t gobuilders/linux-x86-sid .

docker-linux.sid.tar.gz: docker
docker save gobuilders/linux-x86-sid | gzip | (cd ../../upload && go run upload.go --public go-builder-data/docker-linux.sid.tar.gz)
docker save gobuilders/linux-x86-sid | gzip | (cd ../../cmd/upload && go run upload.go --public go-builder-data/docker-linux.sid.tar.gz)

check: docker
docker run -e GOROOT_BOOTSTRAP=/go1.4-amd64/go gobuilders/linux-x86-sid /usr/local/bin/builder -rev=20a10e7ddd1b -buildroot=/ -v -report=false linux-amd64-sid
Expand Down
128 changes: 0 additions & 128 deletions dashboard/updater/updater.go

This file was deleted.

0 comments on commit e83451b

Please sign in to comment.