Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Readme add branch release management #533

Merged
merged 2 commits into from
Jul 19, 2022
Merged

Readme add branch release management #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ca3fca
build: post ovirt-engine-4.5.1
didib Jul 19, 2022
54c6a5e
README: Add Branch/release management
didib Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,3 +623,22 @@ pip3 install "ansible-lint>=6.0.0,<7.0.0"
Run of the lint:

$ ansible-lint -c build/ansible-lint.conf packaging/ansible-runner-service-project/project/roles/*

== Branch/release management

Git branch `master` should always have the latest version.

Releases should be done from stable branches. So-called "bump patches", to
increase the version, should be created using the script `bump_release.sh`.
This creates two git commits - one for doing the release, which should be
tagged, and the next one for getting back to development builds, which
have a timestamp+git-hash in their RPMs names.

When branching stable branches, master branch should be bumped to the next
Y or Z version. There is currently no script for doing that. It can be done
using something like:
```
find . -name pom.xml -exec sed -i "s:4.5.1.3-SNAPSHOT:4.5.2-SNAPSHOT:" {} +
```
Replace `4.5.1.3` with the current version, and `4.5.2` with the version you
want to bump to.
2 changes: 1 addition & 1 deletion backend/manager/dependencies/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core.manager</groupId>
<artifactId>dependencies</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>common-dependencies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>dependencies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/dependencies/tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core.manager</groupId>
<artifactId>dependencies</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>tools-dependencies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/extensions-tool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>extensions-tool</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/logutils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>logutils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/aaa/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>aaa</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/auth-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>auth-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/bll/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>bll</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/branding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>
<artifactId>branding</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/builtin-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>
<groupId>org.ovirt.engine.extension.aaa</groupId>
<artifactId>builtin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/compat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>compat</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/dal/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>
<artifactId>dal</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>docs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/enginesso/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>manager-modules</artifactId>
<groupId>org.ovirt.engine.core</groupId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/extensions-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>extensions-manager</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/logger/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>logger</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/microbenchmarks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>benchmarks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>manager-modules</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/apidoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>restapi-parent</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>restapi-apidoc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/interface/common/jaxrs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>common-parent</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>interface-common-jaxrs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/interface/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>interface</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>common-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/interface/definition/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>interface</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>restapi-definition</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/interface/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>restapi-parent</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>interface</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/jaxrs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>restapi-parent</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>restapi-jaxrs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>restapi-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/types/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>restapi-parent</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>restapi-types</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/restapi/webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.ovirt.engine.api</groupId>
<artifactId>restapi-parent</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>restapi-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/root/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>root-war</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/scheduler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>scheduler</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/searchbackend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>searchbackend</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>services</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>utils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/uutils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>uutils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/vdsbroker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>vdsbroker</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/modules/welcome/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager-modules</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>welcome</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>backend</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>
<artifactId>manager</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/sso-client-registration-tool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>sso-client-registration-tool</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/manager/tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.ovirt.engine.core</groupId>
<artifactId>manager</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>tools</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine</groupId>
<artifactId>root</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>

<artifactId>backend</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion build-tools-root/checkstyles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.ovirt.engine</groupId>
<artifactId>build-tools-root</artifactId>
<version>4.5.1.3-SNAPSHOT</version>
<version>4.5.2-SNAPSHOT</version>
</parent>
<artifactId>checkstyles</artifactId>
<packaging>jar</packaging>
Expand Down
Loading