From f57c3b33b4eff2004af5db2af975db765dcdc20d Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Wed, 15 Apr 2026 08:50:29 +0000 Subject: [PATCH] Add Zuul CI for container builds and functional tests Add a content-provider job that builds the prometheus-podman-exporter container image and runs it through the telemetry functional test pipeline. Add docker-build and docker-push Makefile targets matching the operator convention. Generated-By: Claude-Code claude-opus-4-6 --- .zuul.yaml | 13 +++++++++++++ Makefile | 10 ++++++++++ 2 files changed, 23 insertions(+) create mode 100644 .zuul.yaml diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 00000000..7697b12d --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: openstack-k8s-operators/prometheus-podman-exporter + github-check: + jobs: + - telemetry-container-image-content-provider + - telemetry-openstack-meta-content-provider-master: + override-checkout: main + - functional-tests-osp18: + override-checkout: master + dependencies: + - telemetry-openstack-meta-content-provider-master + - telemetry-container-image-content-provider diff --git a/Makefile b/Makefile index 9169a976..6d0adc48 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +IMG ?= quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest + PKG_PATH = "github.com/containers/prometheus-podman-exporter" BIN := ./bin GO := go @@ -182,6 +184,14 @@ _HLP_TGTS_RX = '^[[:print:]]+:.*?\#\# .*$$' _HLP_TGTS_CMD = grep -E $(_HLP_TGTS_RX) $(MAKEFILE_LIST) _HLP_TGTS_LEN = $(shell $(_HLP_TGTS_CMD) | cut -d : -f 1 | wc -L) _HLPFMT = "%-$(_HLP_TGTS_LEN)s %s\n" +.PHONY: docker-build +docker-build: ## Build container image + podman build -t ${IMG} -f Containerfile . + +.PHONY: docker-push +docker-push: ## Push container image + podman push ${IMG} + .PHONY: help help: ## Print listing of key targets with their descriptions @printf $(_HLPFMT) "Target:" "Description:"