Update ipam image name

gongguan · Dec 5, 2019 · c98e9ac · c98e9ac
1 parent eeb00c1
commit c98e9ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ test:
 
 .PHONY: image
 image: all
-	hack/build.sh build_image_galaxy build_image_ipam
+	hack/build.sh image_galaxy image_ipam
 
 .PHONY: codegen
 codegen:

diff --git a/hack/build.sh b/hack/build.sh
@@ -96,7 +96,7 @@ COPY bin/galaxy-ipam /usr/bin/
 COPY hack/start-ipam.sh /root/
 CMD ["/root/start-ipam.sh"]
 EOF
-  local image=$REGISTRY/galaxy_ipam:${VERSION}
+  local image=$REGISTRY/galaxy-ipam:${VERSION}
   echo docker build -f $temp_dockerfile -t $image .
   docker build -f $temp_dockerfile -t $image .
   docker push $image
@@ -125,10 +125,10 @@ function build::verify() {
         build::ipam
       fi
       ;;
-    build_image_galaxy)
+    image_galaxy)
       build::galaxy_image
       ;;
-    build_image_ipam)
+    image_ipam)
       build::ipam_image
       ;;
     verify)

diff --git a/hack/test.sh b/hack/test.sh
@@ -11,7 +11,7 @@ echo PATH=$PATH
 export GOOS=linux
 # Setting -p=1 because we have to execute database tests in serial. TODO use a database lock to do serial work
 # Using a len=1 golang channel doesn't fix it.
-# go test -coverpkg $PKG/pkg/... -coverprofile=coverage.txt -covermode=atomic -p=1 -v ./tools/... ./cmd/... ./cni/... ./pkg/...
+go test -coverpkg $PKG/pkg/... -coverprofile=coverage.txt -covermode=atomic -p=1 -v ./tools/... ./cmd/... ./cni/... ./pkg/...
 # go tool cover -func=coverage.txt
 for i in e2e/k8s-vlan e2e/veth e2e/cni-request; do
   ginkgo -v $i