Merge "devtools/jiri-test/release_kube.go: minor fix."
diff --git a/jiri-test/internal/test/release_kube.go b/jiri-test/internal/test/release_kube.go
index cf7cd00..ed7b53a 100644
--- a/jiri-test/internal/test/release_kube.go
+++ b/jiri-test/internal/test/release_kube.go
@@ -8,6 +8,7 @@
"fmt"
"os"
"path/filepath"
+ "strings"
"v.io/jiri"
"v.io/jiri/collect"
@@ -19,7 +20,13 @@
if manifestPath == "" {
return nil, fmt.Errorf("SNAPSHOT_MANIFEST environment variable not set")
}
- return vanadiumReleaseKubeCommon(jirix, testName, "staging", filepath.Base(manifestPath))
+ // Remove all separators to make the version string look cleaner.
+ version := filepath.Base(manifestPath)
+ for _, s := range []string{"-", ".", ":"} {
+ version = strings.Replace(version, s, "", -1)
+ }
+ version = "manifest-" + version
+ return vanadiumReleaseKubeCommon(jirix, testName, "staging", version)
}
func vanadiumReleaseKubeProduction(jirix *jiri.X, testName string, opts ...Opt) (_ *test.Result, e error) {
@@ -45,7 +52,7 @@
if version != "" {
args = append(args, fmt.Sprintf("-tag=%s", version))
}
- if err := s.Last(vprodupdaterBin, args...); err != nil {
+ if err := s.Capture(jirix.Stdout(), jirix.Stderr()).Last(vprodupdaterBin, args...); err != nil {
return nil, newInternalError(err, "Run vprodupdater")
}
return &test.Result{Status: test.Passed}, nil
