Merge "Fix ceph-utility image name and distro tags"

Makefile

@@ -32,7 +32,7 @@ PUSH_IMAGE        ?= false
 LABEL             ?= org.airshipit.build=community
 COMMIT            ?= $(shell git rev-parse HEAD)
 DISTRO_SUFFIX     ?= $(DISTRO)
-IMAGE             := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}${IMAGE_TAG_SUFFIX}
+IMAGE              = $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_TAG_SUFFIX)
 BASE_IMAGE        ?=
 # TODO(roman_g): DISTRO_SUFFIX should be autogenerated
 # from Dockerfile extensions, see $(suffix ) Makefile function
@@ -40,15 +40,14 @@ ifeq "$(DISTRO_SUFFIX)" ""
 	# We expect that container is named 'porthole-xxxxx', and
 	# subdirectory is named 'xxxxx'; so we cut 'porthole-' from
 	# directory names here below and in next statement
-	DOCKERFILE = "images/$(subst porthole-,,$(IMAGE_NAME))/Dockerfile"
-	IMAGE_TAG_SUFFIX = ""
+	DOCKERFILE = images/$(subst porthole-,,$(IMAGE_NAME))/Dockerfile
 else
-	DOCKERFILE = "images/$(subst porthole-,,$(IMAGE_NAME))/Dockerfile.$(DISTRO_SUFFIX)"
-	IMAGE_TAG_SUFFIX = "-$(DISTRO_SUFFIX)"
+	DOCKERFILE = images/$(subst porthole-,,$(IMAGE_NAME))/Dockerfile.$(DISTRO_SUFFIX)
+	IMAGE_TAG_SUFFIX = -$(DISTRO_SUFFIX)
 endif
 
 # VERSION INFO
-GIT_COMMIT = ${COMMIT}
+GIT_COMMIT = $(COMMIT)
 GIT_SHA    = $(shell git rev-parse --short HEAD)
 GIT_TAG    = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null)
 GIT_DIRTY  = $(shell test -n "$$(git status --porcelain)" && echo "dirty" || echo "clean")
@@ -60,12 +59,12 @@ ifdef VERSION
 endif
 
 info:
-	@echo "Version:           ${VERSION}"
-	@echo "Git Tag:           ${GIT_TAG}"
-	@echo "Git Commit:        ${GIT_COMMIT}"
-	@echo "Git Tree State:    ${GIT_DIRTY}"
-	@echo "Docker Version:    ${DOCKER_VERSION}"
-	@echo "Registry:          ${DOCKER_REGISTRY}"
+	@echo "Version:           $(VERSION)"
+	@echo "Git Tag:           $(GIT_TAG)"
+	@echo "Git Commit:        $(GIT_COMMIT)"
+	@echo "Git Tree State:    $(GIT_DIRTY)"
+	@echo "Docker Version:    $(DOCKER_VERSION)"
+	@echo "Registry:          $(DOCKER_REGISTRY)"
 
 # TODO(roman_g): currently does not include images, but eventually it should
 all: lint charts
@@ -160,14 +159,14 @@ ifeq ($(USE_PROXY), true)
 		--build-arg HTTP_PROXY=$(PROXY) \
 		--build-arg HTTPS_PROXY=$(PROXY) \
 		--build-arg no_proxy=$(NO_PROXY) \
-		--build-arg NO_PROXY=$(NO_PROXY) "images/$(subst porthole-,,$(IMAGE_NAME))/"
+		--build-arg NO_PROXY=$(NO_PROXY) images/$(subst porthole-,,$(IMAGE_NAME))/
 else
 	docker build --network host -t $(IMAGE) --label $(LABEL) \
 		--label "org.opencontainers.image.revision=$(COMMIT)" \
 		--label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \
 		--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
 		-f $(DOCKERFILE) \
-		$(_BASE_IMAGE_ARG) "images/$(subst porthole-,,$(IMAGE_NAME))/"
+		$(_BASE_IMAGE_ARG) images/$(subst porthole-,,$(IMAGE_NAME))/
 endif
 ifeq ($(PUSH_IMAGE), true)
 	docker push $(IMAGE)

charts/ceph-utility/values.yaml

@@ -25,7 +25,7 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_utility: 'quay.io/airshipit/porthole-ceph-utility:latest'
+    ceph_utility: 'quay.io/airshipit/porthole-ceph-utility:latest-ubuntu_xenial'
     image_repo_sync: docker.io/docker:18.09.02
   local_registry:
     active: false

zuul.d/ceph-utility.yaml

@@ -16,12 +16,11 @@
     name: airship-porthole-images-build-gate-ceph-utility
     parent: &parent airship-porthole-images
     vars:
-      image_name: &image_name ceph-utility
+      image_name: &image_name porthole-ceph-utility
       distro_suffix: &distro_suffix ubuntu_xenial
     files:
-      - ^Dockerfiles/ceph-utility/.*$
-      - ^install_ceph_utility.sh$
-      - ^ceph-utility/.*$
+      - ^charts/ceph-utility/.*$
+      - ^images/ceph-utility/.*$
       - ^Makefile$
       - ^tools/.*$
       - ^zuul.d/.*$

zuul.d/mysqlclient-utility.yaml

@@ -19,9 +19,8 @@
       image_name: &image_name porthole-mysqlclient-utility
       distro_suffix: &distro_suffix ubuntu_xenial
     files:
-      - ^Dockerfiles/mysqlclient-utility/.*$
-      - ^install_mysqlclient_utility.sh$
-      - ^mysqlclient-utility/.*$
+      - ^charts/mysqlclient-utility/.*$
+      - ^images/mysqlclient-utility/.*$
       - ^Makefile$
       - ^tools/.*$
       - ^zuul.d/.*$