summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--releasenotes/config.yaml5
-rw-r--r--reno.yaml4
-rw-r--r--tox.ini3
-rw-r--r--zuul.d/project.yaml1
4 files changed, 7 insertions, 6 deletions
diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml
new file mode 100644
index 000000000..26538010e
--- /dev/null
+++ b/releasenotes/config.yaml
@@ -0,0 +1,5 @@
+---
+# Ignore the kilo-eol tag because that branch does not work with reno
+# and contains no release notes.
+# Ignore bugfix tags because their releasenotes are covered under stable
+closed_branch_tag_re: 'r"(?!^(kilo-|bugfix-)).+-eol$"'
diff --git a/reno.yaml b/reno.yaml
deleted file mode 100644
index dd0aac790..000000000
--- a/reno.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# Ignore the kilo-eol tag because that branch does not work with reno
-# and contains no release notes.
-closed_branch_tag_re: "(.+)(?<!kilo)-eol"
diff --git a/tox.ini b/tox.ini
index b8f6e343a..363ef8918 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,9 @@
[tox]
minversion = 3.18.0
-skipsdist = True
envlist = py3,pep8
ignore_basepython_conflict=true
+requires =
+ tox<4
[testenv]
usedevelop = True
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 000c4ea20..965d50a38 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -6,7 +6,6 @@
- openstack-python3-zed-jobs-ironic-bugfix210-arm64
- periodic-stable-jobs
- publish-openstack-docs-pti
- - release-notes-jobs-python3
check:
jobs:
- ironic-tox-unit-with-driver-libs