From 8c1a5674dd305ad36144080741c56abb450fcb5b Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 11 Dec 2014 16:39:44 -0800 Subject: [PATCH] dashboard: update the watcher and linux base builder image Updates for the hg->git move. Change-Id: I4c1b91ada1b90090db958554c92d06fb1d36ec35 Reviewed-on: https://go-review.googlesource.com/1364 Reviewed-by: Andrew Gerrand --- dashboard/env/commit-watcher/Dockerfile | 2 +- .../env/commit-watcher/scripts/build-commit-watcher.sh | 8 ++++---- dashboard/env/commit-watcher/scripts/install-apt-deps.sh | 2 +- dashboard/env/linux-x86-base/Dockerfile | 2 +- dashboard/env/linux-x86-base/Makefile | 2 +- dashboard/env/linux-x86-base/scripts/build-go-builder.sh | 8 ++++++-- dashboard/env/linux-x86-base/scripts/install-apt-deps.sh | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dashboard/env/commit-watcher/Dockerfile b/dashboard/env/commit-watcher/Dockerfile index 6fffbb44..013bf4cd 100644 --- a/dashboard/env/commit-watcher/Dockerfile +++ b/dashboard/env/commit-watcher/Dockerfile @@ -14,4 +14,4 @@ ADD /scripts/install-apt-deps.sh /scripts/ RUN /scripts/install-apt-deps.sh ADD /scripts/build-commit-watcher.sh /scripts/ -RUN GO_REV=8c27884843c3 WATCHER_REV=ae08a5291439 /scripts/build-commit-watcher.sh && test -f /usr/local/bin/watcher +RUN GO_REV=go1.4 WATCHER_REV=6735829fe0 /scripts/build-commit-watcher.sh && test -f /usr/local/bin/watcher diff --git a/dashboard/env/commit-watcher/scripts/build-commit-watcher.sh b/dashboard/env/commit-watcher/scripts/build-commit-watcher.sh index 7bbfa31c..ca03b415 100755 --- a/dashboard/env/commit-watcher/scripts/build-commit-watcher.sh +++ b/dashboard/env/commit-watcher/scripts/build-commit-watcher.sh @@ -7,14 +7,14 @@ PREFIX=/usr/local : ${WATCHER_REV:?"need to be set to the go.tools repo revision for the commit watcher."} 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 reset --hard $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 $WATCHER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/watcher) +(cd $GO_TOOLS && git reset --hard $WATCHER_REV && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/watcher) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH diff --git a/dashboard/env/commit-watcher/scripts/install-apt-deps.sh b/dashboard/env/commit-watcher/scripts/install-apt-deps.sh index a4e5fc4b..36e859c6 100755 --- a/dashboard/env/commit-watcher/scripts/install-apt-deps.sh +++ b/dashboard/env/commit-watcher/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 apt-get clean rm -fr /var/lib/apt/lists diff --git a/dashboard/env/linux-x86-base/Dockerfile b/dashboard/env/linux-x86-base/Dockerfile index 9c8e6383..3aff6b72 100644 --- a/dashboard/env/linux-x86-base/Dockerfile +++ b/dashboard/env/linux-x86-base/Dockerfile @@ -13,4 +13,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=98c15d46be /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 diff --git a/dashboard/env/linux-x86-base/Makefile b/dashboard/env/linux-x86-base/Makefile index d94baf6d..11692a49 100644 --- a/dashboard/env/linux-x86-base/Makefile +++ b/dashboard/env/linux-x86-base/Makefile @@ -9,4 +9,4 @@ 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) check: docker - docker run gobuilders/linux-x86-base /usr/local/bin/builder -rev=8c27884843c3 -buildroot=/ -v -report=false linux-amd64-temp + docker run gobuilders/linux-x86-base /usr/local/bin/builder -rev=3fa5d3a6dc9 -buildroot=/ -v -report=false linux-amd64-temp diff --git a/dashboard/env/linux-x86-base/scripts/build-go-builder.sh b/dashboard/env/linux-x86-base/scripts/build-go-builder.sh index 6167f300..13b7d738 100755 --- a/dashboard/env/linux-x86-base/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-base/scripts/build-go-builder.sh @@ -7,8 +7,8 @@ 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 @@ -18,3 +18,7 @@ mkdir -p $PREFIX/bin (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-base/scripts/install-apt-deps.sh b/dashboard/env/linux-x86-base/scripts/install-apt-deps.sh index 839f4ad2..c38324c6 100755 --- a/dashboard/env/linux-x86-base/scripts/install-apt-deps.sh +++ b/dashboard/env/linux-x86-base/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