close_issue_2
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dashboard/env: update Linux builders to contain Go 1.4 for GOROOT_BOOTSTRAP 

Change-Id: I256168d1bbe542ae78e4c1e7c4879d2b62b74c7e
Reviewed-on: https://go-review.googlesource.com/2690
Reviewed-by: Andrew Gerrand <adg@golang.org>
This commit is contained in:
Brad Fitzpatrick 2015-01-12 17:36:23 -08:00
parent 682ca03389
commit 996ff9bec3
10 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dashboard/coordinator/main.go
View File

@ -590,6 +590,11 @@ func (conf buildConfig) dockerRunArgs(rev string) (args []string) {
for _, pair := range conf.env { for _, pair := range conf.env {
args = append(args, "-e", pair) args = append(args, "-e", pair)
} }
if strings.HasPrefix(conf.name, "linux-amd64") {
args = append(args, "-e", "GOROOT_BOOTSTRAP=/go1.4-amd64/go")
} else if strings.HasPrefix(conf.name, "linux-386") {
args = append(args, "-e", "GOROOT_BOOTSTRAP=/go1.4-386/go")
}
args = append(args, args = append(args,
conf.image, conf.image,
"/usr/local/bin/builder", "/usr/local/bin/builder",

5
dashboard/env/linux-x86-base/Dockerfile vendored
View File

@ -13,4 +13,7 @@ ADD /scripts/install-apt-deps.sh /scripts/
RUN /scripts/install-apt-deps.sh RUN /scripts/install-apt-deps.sh
ADD /scripts/build-go-builder.sh /scripts/ ADD /scripts/build-go-builder.sh /scripts/
RUN GO_REV=go1.4 BUILDER_REV=6735829f /scripts/build-go-builder.sh && test -f /usr/local/bin/builder RUN GO_REV=go1.4 BUILDER_REV=d79e0375a /scripts/build-go-builder.sh && test -f /usr/local/bin/builder
RUN mkdir -p /go1.4-386 && (curl --silent https://storage.googleapis.com/golang/go1.4.linux-386.tar.gz | tar -C /go1.4-386 -zxv)
RUN mkdir -p /go1.4-amd64 && (curl --silent https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz | tar -C /go1.4-amd64 -zxv)

5
dashboard/env/linux-x86-base/Makefile vendored
View File

@ -9,4 +9,7 @@ docker-linux.base.tar.gz: docker
docker save gobuilders/linux-x86-base | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.base.tar.gz) docker save gobuilders/linux-x86-base | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.base.tar.gz)
check: docker check: docker
docker run gobuilders/linux-x86-base /usr/local/bin/builder -rev=3fa5d3a6dc9 -buildroot=/ -v -report=false linux-amd64-temp 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
check32: docker
docker run -e GOROOT_BOOTSTRAP=/go1.4-386/go gobuilders/linux-x86-base /usr/local/bin/builder -rev=20a10e7ddd1 -buildroot=/ -v -report=false linux-386-temp

2
dashboard/env/linux-x86-base/scripts/install-apt-deps.sh vendored
View File

@ -11,6 +11,8 @@ apt-get install -y --no-install-recommends gcc libc6-dev
apt-get install -y --no-install-recommends libc6-dev-i386 gcc-multilib apt-get install -y --no-install-recommends libc6-dev-i386 gcc-multilib
# For interacting with the Go source & subrepos: # For interacting with the Go source & subrepos:
apt-get install -y --no-install-recommends git-core apt-get install -y --no-install-recommends git-core
# For downloading Go 1.4:
apt-get install -y --no-install-recommends curl
apt-get clean apt-get clean
rm -fr /var/lib/apt/lists rm -fr /var/lib/apt/lists

5
dashboard/env/linux-x86-clang/Dockerfile vendored
View File

@ -15,6 +15,9 @@ ADD /scripts/install-apt-deps.sh /scripts/
RUN /scripts/install-apt-deps.sh RUN /scripts/install-apt-deps.sh
ADD /scripts/build-go-builder.sh /scripts/ ADD /scripts/build-go-builder.sh /scripts/
RUN GO_REV=go1.4 BUILDER_REV=6735829f /scripts/build-go-builder.sh && test -f /usr/local/bin/builder RUN GO_REV=go1.4 BUILDER_REV=d79e0375a /scripts/build-go-builder.sh && test -f /usr/local/bin/builder
ENV CC /usr/bin/clang ENV CC /usr/bin/clang
RUN mkdir -p /go1.4-386 && (curl --silent https://storage.googleapis.com/golang/go1.4.linux-386.tar.gz | tar -C /go1.4-386 -zxv)
RUN mkdir -p /go1.4-amd64 && (curl --silent https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz | tar -C /go1.4-amd64 -zxv)

4
dashboard/env/linux-x86-clang/Makefile vendored
View File

@ -9,7 +9,7 @@ docker-linux.clang.tar.gz: docker
docker save gobuilders/linux-x86-clang | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.clang.tar.gz) docker save gobuilders/linux-x86-clang | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.clang.tar.gz)
check: docker check: docker
docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=77e96c9208d0 -buildroot=/ -v -report=false linux-amd64-temp 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
check32: docker check32: docker
docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=77e96c9208d0 -buildroot=/ -v -report=false linux-386-temp docker run -e GOROOT_BOOTSTRAP=/go1.4-386/go gobuilders/linux-x86-clang /usr/local/bin/builder -rev=20a10e7ddd1b -buildroot=/ -v -report=false linux-386-temp

2
dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh vendored
View File

@ -15,6 +15,8 @@ apt-get install -y --no-install-recommends libc6-dev-i386 gcc-multilib
rm -f /usr/bin/gcc rm -f /usr/bin/gcc
# For interacting with the Go source & subrepos: # For interacting with the Go source & subrepos:
apt-get install -y --no-install-recommends git-core apt-get install -y --no-install-recommends git-core
# For installing Go 1.4:
apt-get install -y --no-install-recommends curl
apt-get clean apt-get clean
rm -fr /var/lib/apt/lists rm -fr /var/lib/apt/lists

5
dashboard/env/linux-x86-sid/Dockerfile vendored
View File

@ -11,4 +11,7 @@ ADD /scripts/install-apt-deps.sh /scripts/
RUN /scripts/install-apt-deps.sh RUN /scripts/install-apt-deps.sh
ADD /scripts/build-go-builder.sh /scripts/ ADD /scripts/build-go-builder.sh /scripts/
RUN GO_REV=go1.4 BUILDER_REV=6735829fe0 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder RUN GO_REV=go1.4 BUILDER_REV=d79e0375a /scripts/build-go-builder.sh && test -f /usr/local/bin/builder
RUN mkdir -p /go1.4-386 && (curl --silent https://storage.googleapis.com/golang/go1.4.linux-386.tar.gz | tar -C /go1.4-386 -zxv)
RUN mkdir -p /go1.4-amd64 && (curl --silent https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz | tar -C /go1.4-amd64 -zxv)

5
dashboard/env/linux-x86-sid/Makefile vendored
View File

@ -9,4 +9,7 @@ docker-linux.sid.tar.gz: docker
docker save gobuilders/linux-x86-sid | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.sid.tar.gz) docker save gobuilders/linux-x86-sid | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.sid.tar.gz)
check: docker check: docker
docker run gobuilders/linux-x86-sid /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -report=false linux-amd64-sid 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
check32: docker
docker run -e GOROOT_BOOTSTRAP=/go1.4-386/go gobuilders/linux-x86-sid /usr/local/bin/builder -rev=20a10e7ddd1b -buildroot=/ -v -report=false linux-386-sid

2
dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh vendored
View File

@ -11,6 +11,8 @@ apt-get install -y --no-install-recommends gcc libc6-dev
apt-get install -y --no-install-recommends libc6-dev-i386 gcc-multilib apt-get install -y --no-install-recommends libc6-dev-i386 gcc-multilib
# For interacting with the Go source & subrepos: # For interacting with the Go source & subrepos:
apt-get install -y --no-install-recommends git-core apt-get install -y --no-install-recommends git-core
# For installing Go 1.4:
apt-get install -y --no-install-recommends curl
apt-get clean apt-get clean
rm -fr /var/lib/apt/lists rm -fr /var/lib/apt/lists