diff --git a/procedures/foreman/branch.md.erb b/procedures/foreman/branch.md.erb index 3f137c6..c2eac20 100644 --- a/procedures/foreman/branch.md.erb +++ b/procedures/foreman/branch.md.erb @@ -103,8 +103,10 @@ The next step should only be done after all branching, including packaging, has - [ ] Merge the earlier created [jenkins-jobs PR](https://github.com/theforeman/jenkins-jobs/pulls) that creates the release pipelines - [ ] Update foreman-packaging rpm/develop to ensure nightlies build: - [ ] rpm/develop: - - [ ] Update the build tag: `sed -i 's/fm<%= release.tr('.', '_') %>/fm<%= develop.tr('.', '_') %>/g' package_manifest.yaml` - - [ ] Set to version `<%= develop %>.0`, reset release to `1` in `packages/foreman/foreman{,-{installer,proxy,release,selinux}}/*.spec` and `packages/foreman/rubygem-hammer_cli{,_foreman}/*.spec`. Then create a changelog using `obal changelog --message '- Bump version to <%= develop %>-develop' foreman{,-{installer,proxy,release,selinux}} rubygem-hammer_cli{,_foreman}` + - Update the build tag: `sed -i 's/fm<%= release.tr('.', '_') %>/fm<%= develop.tr('.', '_') %>/g' package_manifest.yaml` + - Set to version `<%= develop %>.0`, reset release to `1`: `sed -i '/^Version:/ s/[0-9\.]\+$/<%= develop %>.0/ ; /^%global release/ s/[0-9]\+$/1/' packages/foreman/foreman{,-{installer,proxy,release,selinux}}/*.spec packages/foreman/rubygem-hammer_cli{,_foreman}/*.spec` + - Create a changelog using `obal changelog --message '- Bump version to <%= develop %>-develop' foreman{,-{installer,proxy,release,selinux}} rubygem-hammer_cli{,_foreman}` + - Commit: `git commit -a -m 'Bump version to <%= develop %>-develop'` - [ ] deb/develop: `scripts/changelog.rb -v <%= develop %>.0-1 -m "Bump changelog to <%= develop %>.0 to match VERSION" debian/*/*/changelog` - [ ] Prepare build systems for <%= release %> release: - [ ] foreman-packaging's rpm/<%= release %>