Merge branch 'master' into scale-workload-func

kanisterio · Aug 23, 2019 · 11fa095 · 11fa095
2 parents eeb62b4 + b2106f4
commit 11fa095
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -111,7 +111,6 @@ shell: build-dirs
 		-v "${HOME}/.kube:/root/.kube"                          \
 		-v "$(PWD):/go/src/$(PKG)"                              \
 		-v "$(PWD)/bin/$(ARCH):/go/bin"                         \
-		-v "$(PWD)/bin/$(ARCH):/go/bin/$$(go env GOOS)_$(ARCH)" \
 		-v /var/run/docker.sock:/var/run/docker.sock            \
 		-w /go/src/$(PKG)                                       \
 		$(BUILD_IMAGE)                                          \
@@ -199,7 +198,7 @@ ifeq ($(DOCKER_BUILD),"true")
 		-v "$(PWD)/.go/pkg:/go/pkg"                                 \
 		-v "$(PWD)/.go/cache:/go/.cache"                            \
 		-v "$(PWD):/go/src/$(PKG)"                                  \
-		-v "$(PWD)/bin/$(ARCH)/$$(go env GOOS)_$(ARCH):/go/bin"     \
+		-v "$(PWD)/bin/$(ARCH):/go/bin"                             \
 		-v "$(PWD)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)" \
 		-v /var/run/docker.sock:/var/run/docker.sock                \
 		-w /go/src/$(PKG)                                           \

diff --git a/pkg/chronicle/chronicle_test.go b/pkg/chronicle/chronicle_test.go
@@ -44,7 +44,8 @@ func (s *ChronicleSuite) TestPushPull(c *C) {
 	c.Assert(err, IsNil)
 
 	a := filepath.Join(c.MkDir(), "artifact")
-	err = ioutil.WriteFile(a, []byte(rand.String(10)), os.ModePerm)
+	ap := rand.String(10)
+	err = ioutil.WriteFile(a, []byte(ap), os.ModePerm)
 	c.Assert(err, IsNil)
 	p := PushParams{
 		ProfilePath:  pp,
@@ -60,7 +61,8 @@ func (s *ChronicleSuite) TestPushPull(c *C) {
 
 		// Pull and check that we still get i
 		buf := bytes.NewBuffer(nil)
-		err = Pull(ctx, buf, s.profile, p.ArtifactFile)
+		c.Log("File: ", p.ArtifactFile)
+		err = Pull(ctx, buf, s.profile, ap)
 		c.Assert(err, IsNil)
 		str, err := ioutil.ReadAll(buf)
 		c.Assert(err, IsNil)