Fix publishing job, rename build Makefile target

airship/maas and airship/armada use 'build' Makefile target name to
build images. Thus changeing target name here also to simple 'build',
instead of 'build-image'. Breaking change.

Publishing job has had a mistype in Makefile target. Fixing it.

Change-Id: I5b2f0afc66309756df0bc7d82dfc139bb6821d47

Makefile

@@ -142,11 +142,11 @@ images: $(IMAGES)
 $(IMAGES):
 	@echo
 	@echo "===== Processing [$@] image  ====="
-	@make build-image IMAGE_NAME=$(IMAGE_NAME) DOCKERFILE=$(DOCKERFILE)
+	@make build IMAGE_NAME=$(IMAGE_NAME) DOCKERFILE=$(DOCKERFILE)
 
 _BASE_IMAGE_ARG := $(if $(BASE_IMAGE),--build-arg FROM="${BASE_IMAGE}" ,)
 
-build-image:
+build:
 	@echo "Building $(IMAGE_NAME)..."
 ifeq ($(USE_PROXY), true)
 	docker build --network host -t $(IMAGE) --label $(LABEL) \
@@ -173,7 +173,7 @@ ifeq ($(PUSH_IMAGE), true)
 	docker push $(IMAGE)
 endif
 
-.PHONY: $(CHARTS) all build-image-% chartbanner charts check-docker clean \
+.PHONY: $(CHARTS) $(IMAGES) all build chartbanner charts check-docker clean \
         docs dry-run-% dry-run format helm-init-% helm-install helm-lint-% \
-		helm-lint helm-serve images info lint run_$(IMAGE_NAME) run_images \
+        helm-lint helm-serve images info lint run_$(IMAGE_NAME) run_images \
         tests

tools/gate/playbooks/docker-image-build.yaml

@@ -93,7 +93,7 @@
       block:
         - make:
             chdir: "{{ zuul.project.src_dir }}"
-            target: "build-image"
+            target: "build"
             params:
               DISTRO_SUFFIX: "{{ distro_suffix }}"
               IMAGE_NAME: "{{ image_name }}"
@@ -120,7 +120,7 @@
             registry_url: "https://quay.io/api/v1/"
         - make:
             chdir: "{{ zuul.project.src_dir }}"
-            target: "build-image-{{ image_name }}"
+            target: "build"
             params:
               COMMIT: "{{ zuul.newrev | default('') }}"
               DISTRO_SUFFIX: "{{ distro_suffix }}"