From a29414f5429128647aea434ac506cc19435ca29e Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Fri, 25 Oct 2024 16:28:17 -0500 Subject: [PATCH 1/3] docs: fix docs generation for workflows --- Makefile | 6 +++--- workflows/argo-events/docs/README.md | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 120000 workflows/argo-events/docs/README.md diff --git a/Makefile b/Makefile index bb526115c..c32a69ab3 100644 --- a/Makefile +++ b/Makefile @@ -26,14 +26,14 @@ $(ACTIVATE): requirements-docs.txt @$(PIP) install -U -r requirements-docs.txt @touch $(ACTIVATE) -docs/workflows: $(ACTIVATE) +docs/workflows/argo-events.md: $(ACTIVATE) @mkdir -p docs/workflows @$(PYTHON) scripts/argo-workflows-to-mkdocs.py workflows docs/workflows .PHONY: docs -docs: $(ACTIVATE) docs/workflows ## Builds the documentation +docs: $(ACTIVATE) docs/workflows/argo-events.md ## Builds the documentation $(MKDOCS) build --strict .PHONY: docs-local -docs-local: $(ACTIVATE) docs/workflows ## Build and locally host the documentation +docs-local: $(ACTIVATE) docs/workflows/argo-events.md ## Build and locally host the documentation $(MKDOCS) serve --strict diff --git a/workflows/argo-events/docs/README.md b/workflows/argo-events/docs/README.md deleted file mode 120000 index bb92d1639..000000000 --- a/workflows/argo-events/docs/README.md +++ /dev/null @@ -1 +0,0 @@ -../../../docs/component-understack-workflows.md \ No newline at end of file From 4493c7868561c78e6374aa8d86c621515fa8f78a Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Fri, 25 Oct 2024 11:41:15 -0500 Subject: [PATCH 2/3] ci: validate renovate configs in pre-commit --- .pre-commit-config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 80f8269ac..ca26115ce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -61,3 +61,7 @@ repos: name: "poetry-lock (understack-workflows)" files: '^python/understack-workflows/' args: ["-C", "python/understack-workflows", "--no-update"] + - repo: https://github.com/renovatebot/pre-commit-hooks + rev: 38.114.0 + hooks: + - id: renovate-config-validator From 9462a659474db777e7861c3a9540a588a103624c Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Fri, 25 Oct 2024 11:18:40 -0500 Subject: [PATCH 3/3] ci: add renovate rule to track OpenStack Helm releases Added a rule for renovate to be able to track when there are new OpenStack Helm releases. --- .github/renovate.json | 19 +++++++++++++++++++ apps/appsets/openstack.yaml | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index 210b26da2..f35a0334b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -10,5 +10,24 @@ ":prNotPending", ":rebaseStalePrs", ":automergeDigest" + ], + "customDatasources": { + "openstackhelm": { + "defaultRegistryUrlTemplate": "https://tarballs.opendev.org/openstack/openstack-helm/", + "format": "html", + "transformTemplates": [ + "{\"releases\": $map($filter($.releases, function($v) {$match($v.version, /^{{packageName}}-/)}), function($v) { {\"version\": $match($v.version, /^{{packageName}}-([0-9.]+).tar.gz$/).groups[0]} } ) }" + ] + } + }, + "customManagers": [ + { + "customType": "regex", + "fileMatch": ["\\.yaml$"], + "datasourceTemplate": "custom.openstackhelm", + "matchStrings": [ + "#\\s*renovate:\\s*(datasource=(?.*?)\\s*)?depName=(?.*?)\\s*chartVersion:\\s*(?.+?)\\s" + ] + } ] } diff --git a/apps/appsets/openstack.yaml b/apps/appsets/openstack.yaml index 07fcd711d..b5425b6aa 100644 --- a/apps/appsets/openstack.yaml +++ b/apps/appsets/openstack.yaml @@ -17,18 +17,25 @@ spec: - list: elements: - component: keystone + # renovate: datasource=custom.openstackhelm depName=keystone chartVersion: 0.3.15 - component: ironic + # renovate: datasource=custom.openstackhelm depName=ironic chartVersion: 0.2.18 - component: placement + # renovate: datasource=custom.openstackhelm depName=placement chartVersion: 0.3.16 - component: neutron + # renovate: datasource=custom.openstackhelm depName=neutron chartVersion: 0.3.47 - component: glance + # renovate: datasource=custom.openstackhelm depName=glance chartVersion: 0.5.0 - component: nova + # renovate: datasource=custom.openstackhelm depName=nova chartVersion: 0.3.44 - component: horizon + # renovate: datasource=custom.openstackhelm depName=horizon chartVersion: 0.3.28 template: metadata: