From d5854b7d675acdab6eb93d8e243e7ef89672ea2f Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 11 Dec 2014 19:17:35 -0800 Subject: [PATCH] dashboard: update Linux clang, nacl, and sid builders Change-Id: I69cda2fb7b0047201999781cdb27f4a9013920c6 Reviewed-on: https://go-review.googlesource.com/1367 Reviewed-by: David Symonds --- dashboard/env/linux-x86-clang/Dockerfile | 2 +- dashboard/env/linux-x86-clang/Makefile | 4 ++-- .../env/linux-x86-clang/scripts/build-go-builder.sh | 12 ++++++++---- .../env/linux-x86-clang/scripts/install-apt-deps.sh | 2 +- dashboard/env/linux-x86-nacl/Dockerfile | 2 +- dashboard/env/linux-x86-nacl/Makefile | 2 +- .../env/linux-x86-nacl/scripts/build-go-builder.sh | 12 ++++++++---- .../env/linux-x86-nacl/scripts/install-apt-deps.sh | 2 +- dashboard/env/linux-x86-sid/Dockerfile | 2 +- .../env/linux-x86-sid/scripts/build-go-builder.sh | 10 +++++++--- .../env/linux-x86-sid/scripts/install-apt-deps.sh | 2 +- 11 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dashboard/env/linux-x86-clang/Dockerfile b/dashboard/env/linux-x86-clang/Dockerfile index 02ef66e3..05e5319f 100644 --- a/dashboard/env/linux-x86-clang/Dockerfile +++ b/dashboard/env/linux-x86-clang/Dockerfile @@ -15,6 +15,6 @@ ADD /scripts/install-apt-deps.sh /scripts/ RUN /scripts/install-apt-deps.sh ADD /scripts/build-go-builder.sh /scripts/ -RUN GO_REV=8c27884843c3 BUILDER_REV=ced78bfefcb3 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder +RUN GO_REV=go1.4 BUILDER_REV=6735829f /scripts/build-go-builder.sh && test -f /usr/local/bin/builder ENV CC /usr/bin/clang diff --git a/dashboard/env/linux-x86-clang/Makefile b/dashboard/env/linux-x86-clang/Makefile index 5e1ed0ff..13c899d4 100644 --- a/dashboard/env/linux-x86-clang/Makefile +++ b/dashboard/env/linux-x86-clang/Makefile @@ -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) check: docker - docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -report=false linux-amd64-temp + docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=77e96c9208d0 -buildroot=/ -v -report=false linux-amd64-temp check32: docker - docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -report=false linux-386-temp + docker run gobuilders/linux-x86-clang /usr/local/bin/builder -rev=77e96c9208d0 -buildroot=/ -v -report=false linux-386-temp diff --git a/dashboard/env/linux-x86-clang/scripts/build-go-builder.sh b/dashboard/env/linux-x86-clang/scripts/build-go-builder.sh index 097ac171..13b7d738 100755 --- a/dashboard/env/linux-x86-clang/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-clang/scripts/build-go-builder.sh @@ -7,14 +7,18 @@ PREFIX=/usr/local : ${BUILDER_REV:?"need to be set to the go.tools repo revision for the builder."} mkdir -p $GOROOT -curl -s https://storage.googleapis.com/gobuilder/go-snap.tar.gz | tar x --no-same-owner -zv -C $GOROOT -(cd $GOROOT/src && hg pull -r $GO_REV -u && find && ./make.bash) +git clone https://go.googlesource.com/go $GOROOT +(cd $GOROOT/src && git checkout $GO_REV && find && ./make.bash) GO_TOOLS=$GOPATH/src/golang.org/x/tools mkdir -p $GO_TOOLS -curl -s https://storage.googleapis.com/gobuilder/go.tools-snap.tar.gz | tar x --no-same-owner -zv -C $GO_TOOLS +git clone https://go.googlesource.com/tools $GO_TOOLS mkdir -p $PREFIX/bin -(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) +(cd $GO_TOOLS && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH + +cd $GOROOT +git clean -f -d -x +git checkout master diff --git a/dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh b/dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh index 1382dd6a..76e18734 100755 --- a/dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh +++ b/dashboard/env/linux-x86-clang/scripts/install-apt-deps.sh @@ -15,7 +15,7 @@ apt-get install -y --no-install-recommends libc6-dev-i386 gcc-multilib # Remove gcc binary so it doesn't interfere with clang rm -f /usr/bin/gcc # For interacting with the Go source & subrepos: -apt-get install -y --no-install-recommends mercurial git-core +apt-get install -y --no-install-recommends git-core apt-get clean rm -fr /var/lib/apt/lists diff --git a/dashboard/env/linux-x86-nacl/Dockerfile b/dashboard/env/linux-x86-nacl/Dockerfile index 68a8df52..6c491d20 100644 --- a/dashboard/env/linux-x86-nacl/Dockerfile +++ b/dashboard/env/linux-x86-nacl/Dockerfile @@ -20,7 +20,7 @@ ADD /scripts/install-apt-deps.sh /scripts/ RUN /scripts/install-apt-deps.sh ADD /scripts/build-go-builder.sh /scripts/ -RUN GO_REV=8c27884843c3 BUILDER_REV=ced78bfefcb3 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder +RUN GO_REV=go1.4 BUILDER_REV=6735829f /scripts/build-go-builder.sh && test -f /usr/local/bin/builder ADD build-command.pl /usr/local/bin/ diff --git a/dashboard/env/linux-x86-nacl/Makefile b/dashboard/env/linux-x86-nacl/Makefile index 3c2b7e3a..db62b071 100644 --- a/dashboard/env/linux-x86-nacl/Makefile +++ b/dashboard/env/linux-x86-nacl/Makefile @@ -9,4 +9,4 @@ upload: docker docker save gobuilders/linux-x86-nacl | gzip | (cd ../../coordinator/buildongce && go run create.go --write_object=go-builder-data/docker-linux.nacl.tar.gz) check: docker - docker run gobuilders/linux-x86-nacl /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -cmd=/usr/local/bin/build-command.pl -report=false nacl-amd64p32-temp + 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 diff --git a/dashboard/env/linux-x86-nacl/scripts/build-go-builder.sh b/dashboard/env/linux-x86-nacl/scripts/build-go-builder.sh index 10bf847b..8cf9c271 100755 --- a/dashboard/env/linux-x86-nacl/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-nacl/scripts/build-go-builder.sh @@ -7,15 +7,15 @@ PREFIX=/usr/local : ${BUILDER_REV:?"need to be set to the go.tools repo revision for the builder."} mkdir -p $GOROOT -curl -s https://storage.googleapis.com/gobuilder/go-snap.tar.gz | tar x --no-same-owner -zv -C $GOROOT -(cd $GOROOT/src && hg pull -r $GO_REV -u && find && ./make.bash) +git clone https://go.googlesource.com/go $GOROOT +(cd $GOROOT/src && git checkout $GO_REV && find && ./make.bash) GO_TOOLS=$GOPATH/src/golang.org/x/tools mkdir -p $GO_TOOLS -curl -s https://storage.googleapis.com/gobuilder/go.tools-snap.tar.gz | tar x --no-same-owner -zv -C $GO_TOOLS +git clone https://go.googlesource.com/tools $GO_TOOLS mkdir -p $PREFIX/bin -(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) +(cd $GO_TOOLS && git reset --hard $BUILDER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH @@ -24,3 +24,7 @@ rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH ln -s $GOROOT/misc/nacl/go_nacl_386_exec /usr/local/bin/ ln -s $GOROOT/misc/nacl/go_nacl_amd64p32_exec /usr/local/bin/ + +cd $GOROOT +git clean -f -d -x +git checkout master diff --git a/dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh b/dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh index f5186467..08eeb8ef 100755 --- a/dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh +++ b/dashboard/env/linux-x86-nacl/scripts/install-apt-deps.sh @@ -6,7 +6,7 @@ apt-get install -y --no-install-recommends curl ca-certificates # For building Go's bootstrap 'dist' prog apt-get install -y --no-install-recommends gcc libc6-dev # For interacting with the Go source & subrepos: -apt-get install -y --no-install-recommends mercurial git-core +apt-get install -y --no-install-recommends git-core # For 32-bit nacl: apt-get install -y --no-install-recommends libc6-i386 libc6-dev-i386 lib32stdc++6 gcc-multilib diff --git a/dashboard/env/linux-x86-sid/Dockerfile b/dashboard/env/linux-x86-sid/Dockerfile index 057e93ae..db3db480 100644 --- a/dashboard/env/linux-x86-sid/Dockerfile +++ b/dashboard/env/linux-x86-sid/Dockerfile @@ -11,4 +11,4 @@ ADD /scripts/install-apt-deps.sh /scripts/ RUN /scripts/install-apt-deps.sh ADD /scripts/build-go-builder.sh /scripts/ -RUN GO_REV=8c27884843c3 BUILDER_REV=ced78bfefcb3 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder +RUN GO_REV=go1.4 BUILDER_REV=6735829fe0 /scripts/build-go-builder.sh && test -f /usr/local/bin/builder diff --git a/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh b/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh index 097ac171..9cc8285f 100755 --- a/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh @@ -7,14 +7,18 @@ PREFIX=/usr/local : ${BUILDER_REV:?"need to be set to the go.tools repo revision for the builder."} mkdir -p $GOROOT -curl -s https://storage.googleapis.com/gobuilder/go-snap.tar.gz | tar x --no-same-owner -zv -C $GOROOT -(cd $GOROOT/src && hg pull -r $GO_REV -u && find && ./make.bash) +git clone https://go.googlesource.com/go $GOROOT +(cd $GOROOT/src && git checkout $GO_REV && find && ./make.bash) GO_TOOLS=$GOPATH/src/golang.org/x/tools mkdir -p $GO_TOOLS -curl -s https://storage.googleapis.com/gobuilder/go.tools-snap.tar.gz | tar x --no-same-owner -zv -C $GO_TOOLS +git clone https://go.googlesource.com/tools $GO_TOOLS mkdir -p $PREFIX/bin (cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH + +cd $GOROOT +git clean -f -d -x +git checkout master diff --git a/dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh b/dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh index 839f4ad2..c38324c6 100755 --- a/dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh +++ b/dashboard/env/linux-x86-sid/scripts/install-apt-deps.sh @@ -11,7 +11,7 @@ apt-get install -y --no-install-recommends gcc libc6-dev # TODO(bradfitz): move these into a 386 image that derives from this one. apt-get install -y --no-install-recommends libc6-dev-i386 gcc-multilib # For interacting with the Go source & subrepos: -apt-get install -y --no-install-recommends mercurial git-core +apt-get install -y --no-install-recommends git-core apt-get clean rm -fr /var/lib/apt/lists