Merge "v.io/jiri: allow runp to be run from $JIRI_ROOT"
diff --git a/jiri-profile-v23/syncbase_profile/syncbase.go b/jiri-profile-v23/syncbase_profile/syncbase.go
index f008463..921a673 100644
--- a/jiri-profile-v23/syncbase_profile/syncbase.go
+++ b/jiri-profile-v23/syncbase_profile/syncbase.go
@@ -9,6 +9,7 @@
"bytes"
"flag"
"fmt"
+ "io/ioutil"
"os"
"path/filepath"
"runtime"
@@ -359,8 +360,8 @@
installSnappyFn := func() error {
s := jirix.NewSeq()
snappySrcDir := m.snappySrcDir.Abs(jirix)
- // ignore errors from make distclean.
- s.Pushd(snappySrcDir).Last("make", "distclean")
+ // Ignore errors from make distclean.
+ s.Pushd(snappySrcDir).Capture(ioutil.Discard, ioutil.Discard).Last("make", "distclean")
if err := s.Pushd(snappySrcDir).
Last("autoreconf", "--install", "--force", "--verbose"); err != nil {
return err
diff --git a/jiri-test/internal/test/release_kube.go b/jiri-test/internal/test/release_kube.go
index d8c84ca..d9f8774 100644
--- a/jiri-test/internal/test/release_kube.go
+++ b/jiri-test/internal/test/release_kube.go
@@ -46,6 +46,7 @@
}
vprodupdaterBin := filepath.Join(jirix.Root, "infrastructure", "go", "bin", "vprodupdater")
args := []string{
+ "update",
fmt.Sprintf("-type=%s", updateType),
fmt.Sprintf("-tag=%s", version),
}
