Jira (PDB-5614) Merge-up, branch, and create pipelines (Puppet Platform 7.24.0)

19 views
Skip to first unread message

tefoji (Jira)

unread,
Mar 24, 2023, 7:22:01 PM3/24/23
to puppe...@googlegroups.com
tefoji created an issue
 
PuppetDB / Task PDB-5614
Merge-up, branch, and create pipelines (Puppet Platform 7.24.0)
Issue Type: Task Task
Assignee: Jonathan Newman
Created: 2023/03/24 4:21 PM
Due Date: 2023/03/29
Priority: Normal Normal
Reporter: tefoji

(Initial planned release date: 2023-04-04)

Is the code ready for release? Check that the latest nightly ("Periodic") build was green. You only need to check the links that are relevant to the release that you're preparing (for example, doing a release that doesn't include LTS).

Do merge-ups:

  • Merge 6.x -> main

Important: Do this for both the core puppetdb repo and the
pe-puppetdb-extensions repo!

These should be submitted as PRs and merged after tests pass, if there's
anything remotely interesting about the merges. If the merges are boring,
then direct push is fine.

SKIP ALL REMAINING STEPS - We are leaving them here until we
have a better place to document the process to create a new
branch. When we release a new Y version we do it off of main and
cut a maintained branch later (if at all).

Then, prepare the branch for release:

  • If needed, create the branch (off of main, almost certainly)
  • Check that there aren't any essential updates to ezbake needed in this release
  • Update the branch in the README's Travis CI build icon link
  • Update the version in project.clj in both repos. Continue to use a -SNAPSHOT version for now
  • Push each branch directly to the puppetlabs github repo.

Update ci-job-configs:

Update travis to add a cron job for the new branch:

Update the headers in all the puppetdb docs:

  • changes need to be made to the puppet-docs repo. See this PR for an example.

Update travis integration test refs:

  • Once Puppet and PuppetServer have created their release branches, update our testing defaults and .travis.yml file to run integration tests against the new branches. Our strategy is to test the corresponding release branches of Puppet and PuppetServer and the previous release branches for each release branch of PuppetDB.
  • ext/test-conf/puppet-ref-default and ext/test-conf/puppetserver-ref-default should point to the corresponding release branch for the new puppetdb branch
  • PuppetDB 6.x is in Platform 6.x, this means it should run
    integration tests against the pair of release branches Puppet
    6.x and PuppetServer 6.x, which are also in the same Platform
    release.
  • For main, we should always test against puppetserver and
    puppet main as well as the most recent release branch for each
    product.
Add Comment Add Comment
 
This message was sent by Atlassian Jira (v8.20.11#820011-sha1:0629dd8)
Atlassian logo

tefoji (Jira)

unread,
Mar 24, 2023, 7:22:02 PM3/24/23
to puppe...@googlegroups.com

Jonathan Newman (Jira)

unread,
Mar 24, 2023, 7:32:01 PM3/24/23
to puppe...@googlegroups.com

Jonathan Newman (Jira)

unread,
Mar 24, 2023, 7:32:01 PM3/24/23
to puppe...@googlegroups.com

Shaigy Nixon (Jira)

unread,
Mar 28, 2023, 1:59:01 PM3/28/23
to puppe...@googlegroups.com
Shaigy Nixon updated an issue
Change By: Shaigy Nixon
Sprint: Dumpling Ready to Groom 04-11-23

Shaigy Nixon (Jira)

unread,
Mar 28, 2023, 1:59:01 PM3/28/23
to puppe...@googlegroups.com

Jonathan Newman (Jira)

unread,
Mar 28, 2023, 5:22:04 PM3/28/23
to puppe...@googlegroups.com
Jonathan Newman assigned an issue to Unassigned
Change By: Jonathan Newman
Assignee: Jonathan Newman

Rob Browning (Jira)

unread,
Mar 29, 2023, 2:23:02 PM3/29/23
to puppe...@googlegroups.com
Rob Browning updated an issue
Change By: Rob Browning
(Initial planned release date: 2023-04-04)

Is the code ready for release? Check that the latest nightly ("Periodic") build was green. You only need to check the links that are relevant to the release that you're preparing (for example, doing a release that doesn't include LTS).



Important: Do this for both the core puppetdb repo and the
pe-puppetdb-extensions repo!

These should be submitted as PRs and merged after tests pass, if there's
anything remotely interesting about the merges. If the merges are boring,
then direct push is fine.

SKIP ALL REMAINING STEPS - We are leaving them here until we
have a better place to document the process to create a new
branch. When we release a new Y version we do it off of main and
cut a maintained branch later (if at all).

Then, prepare the branch for release:

* If needed, create the branch (off of main, almost certainly)

* Check that there aren't any essential updates to ezbake needed in this release

* Update the branch in the README's Travis CI build icon link

* Update the version in project.clj in both repos. Continue to use a -SNAPSHOT version for now

* Push each branch *directly* to the puppetlabs github repo.

Update ci-job-configs:

* https://github.com/puppetlabs/ci-job-configs/blob/main/jenkii/enterprise/projects/puppetdb.yaml#L49-L52

* https://github.com/puppetlabs/ci-job-configs/blob/main/jenkii/enterprise/projects/puppetdb.yaml#L170-L180

* Add a new tab to Jenkins if needed: hit the + tab in the link here https://jenkins-enterprise.delivery.puppetlabs.net/view/puppetdb/, select "list view", and add the following rule to the regex section that matches the build you're preparing. Example: (?!experimental).*puppetdb.*5.2.x


Update travis to add a cron job for the new branch:



Update the headers in all the puppetdb docs:

* changes need to be made to the puppet-docs repo. See [this PR|https://github.com/puppetlabs/puppet-docs/pull/888/files] for an example.


Update travis integration test refs:

* Once Puppet and PuppetServer have created their release branches, update our testing defaults and .travis.yml file to run integration tests against the new branches. Our strategy is to test the corresponding release branches of Puppet and PuppetServer and the previous release branches for each release branch of PuppetDB.

* ext/test-conf/puppet-ref-default and ext/test-conf/puppetserver-ref-default should point to the corresponding release branch for the new puppetdb branch

* PuppetDB 6.x is in Platform 6.x, this means it should run

  integration tests against the pair of release branches Puppet
  6.x and PuppetServer 6.x, which are also in the same Platform
  release.

* For main, we should always test against puppetserver and

  puppet main as well as the most recent release branch for each
  product.

Nick Burgan (Jira)

unread,
Mar 30, 2023, 1:53:01 PM3/30/23
to puppe...@googlegroups.com
Nick Burgan updated an issue
Change By: Nick Burgan
(Initial planned release date: 2023-04-04)

Is the code ready for release? Check that the latest nightly ("Periodic") build was green. You only need to check the links that are relevant to the release that you're preparing (for example, doing a release that doesn't include LTS).

* [jenkins: main|https://jenkins-enterprise.delivery.puppetlabs.net/view/puppetdb/view/main/]
- Do merge-ups:

* Merge 7.x -> main


Important: Do this for both the core puppetdb repo and the
pe-puppetdb-extensions repo!

These should be submitted as PRs and merged after tests pass, if there's
anything remotely interesting about the merges. If the merges are boring,
then direct push is fine. -

Nick Burgan (Jira)

unread,
Mar 30, 2023, 1:54:01 PM3/30/23
to puppe...@googlegroups.com
Nick Burgan updated an issue
(Initial planned release date: 2023-04-04)

Is the code ready for release? Check that the latest nightly ("Periodic") build was green. You only need to check the links that are relevant to the release that you're preparing (for example, doing a release that doesn't include LTS).

-Do merge-ups: -

* - Merge 7.x -> main -

- Important: Do this for both the core puppetdb repo and the
pe-puppetdb-extensions repo! -

- These should be submitted as PRs and merged after tests pass, if there's
anything remotely interesting about the merges. If the merges are boring,
then direct push is fine.-

SKIP ALL REMAINING STEPS - We are leaving them here until we
have a better place to document the process to create a new
branch. When we release a new Y version we do it off of main and
cut a maintained branch later (if at all).

Then, prepare the branch for release:

* If needed, create the branch (off of main, almost certainly)

* Check that there aren't any essential updates to ezbake needed in this release

* Update the branch in the README's Travis CI build icon link

* Update the version in project.clj in both repos. Continue to use a -SNAPSHOT version for now

* Push each branch *directly* to the puppetlabs github repo.

Update ci-job-configs:

* [ https://github.com/puppetlabs/ci-job-configs/blob/main/jenkii/enterprise/projects/puppetdb.yaml#L49-L52 ]

*
[ https://github.com/puppetlabs/ci-job-configs/blob/main/jenkii/enterprise/projects/puppetdb.yaml#L170-L180 ]


* Add a new tab to Jenkins if needed: hit the + tab in the link here
[ https://jenkins-enterprise.delivery.puppetlabs.net/view/puppetdb/ ] , select "list view", and add the following rule to the regex section that matches the build you're preparing. Example: (?!experimental).*puppetdb.*5.2.x


Update travis to add a cron job for the new branch:

* [ https://app.travis-ci.com/github/puppetlabs/puppetdb/settings ]

*
[ https://app.travis-ci.com/github/puppetlabs/pe-puppetdb-extensions/settings ]

Update the headers in all the puppetdb docs:

* changes need to be made to the puppet-docs repo. See [this PR|https://github.com/puppetlabs/puppet-docs/pull/888/files] for an example.

Update travis integration test refs:

* Once Puppet and PuppetServer have created their release branches, update our testing defaults and .travis.yml file to run integration tests against the new branches. Our strategy is to test the corresponding release branches of Puppet and PuppetServer and the previous release branches for each release branch of PuppetDB.

* ext/test-conf/puppet-ref-default and ext/test-conf/puppetserver-ref-default should point to the corresponding release branch for the new puppetdb branch

* PuppetDB 6.x is in Platform 6.x, this means it should run
  integration tests against the pair of release branches Puppet
  6.x and PuppetServer 6.x, which are also in the same Platform
  release.

* For main, we should always test against puppetserver and
  puppet main as well as the most recent release branch for each
  product.

Nick Burgan (Jira)

unread,
Mar 30, 2023, 2:10:01 PM3/30/23
to puppe...@googlegroups.com
Reply all
Reply to author
Forward
0 new messages