PilzDE · rfeistenauer · Jan 27, 2021 · Jan 26, 2021 · Jan 26, 2021 · Jan 26, 2021
diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml
@@ -1,4 +1,4 @@
-name: CI
+name: CI-Noetic
 
 on: [push, pull_request]
 

diff --git a/.github/workflows/industrial_ci_prerelease.yml b/.github/workflows/industrial_ci_prerelease.yml
@@ -1,4 +1,4 @@
-name: CI prerelease
+name: CI-Noetic-Prerelease
 
 on: pull_request
 

diff --git a/README.md b/README.md
@@ -16,9 +16,15 @@ sudo apt install ros-$ROS_DISTRO-pilz-robots
 
 |   | Kinetic | Melodic | Noetic
 | ----| --------|-------- |-------- |
-| Travis  | [![Build Status](https://travis-ci.org/PilzDE/pilz_robots.svg?branch=kinetic-devel)](https://travis-ci.org/PilzDE/pilz_robots) | [![Build Status](https://travis-ci.org/PilzDE/pilz_robots.svg?branch=melodic-devel)](https://travis-ci.org/PilzDE/pilz_robots) |
-| Buildfarm src | [![buildfarm](http://build.ros.org/buildStatus/icon?job=Ksrc_uX__pilz_robots__ubuntu_xenial__source)](http://build.ros.org/view/Ksrc_uX/job/Ksrc_uX__pilz_robots__ubuntu_xenial__source/) | [![buildfarm](http://build.ros.org/buildStatus/icon?job=Msrc_uB__pilz_robots__ubuntu_bionic__source)](http://build.ros.org/view/Msrc_uB/job/Msrc_uB__pilz_robots__ubuntu_bionic__source/) |
-| Buildfarm bin | [![buildfarm](http://build.ros.org/buildStatus/icon?job=Kbin_uX64__pilz_robots__ubuntu_xenial_amd64__binary)](http://build.ros.org/view/Kbin_uX64/job/Kbin_uX64__pilz_robots__ubuntu_xenial_amd64__binary/) | [![buildfarm](http://build.ros.org/buildStatus/icon?job=Mbin_uB64__pilz_robots__ubuntu_bionic_amd64__binary)](http://build.ros.org/view/Mbin_uB64/job/Mbin_uB64__pilz_robots__ubuntu_bionic_amd64__binary/)|
+| Travis/Github CI  | [![Build Status](https://travis-ci.org/PilzDE/pilz_robots.svg?branch=kinetic-devel)](https://travis-ci.org/PilzDE/pilz_robots) | [![CI-Melodic](https://github.com/PilzDE/pilz_robots/workflows/CI-Melodic/badge.svg?event=push)](https://github.com/PilzDE/pilz_robots/actions?query=event%3Apush+workflow%3ACI-Melodic+branch%3Amelodic-devel) | [![CI-Noetic](https://github.com/PilzDE/pilz_robots/workflows/CI-Noetic/badge.svg?event=push)](https://github.com/PilzDE/pilz_robots/actions?query=event%3Apush+workflow%3ACI-Noetic+branch%3Anoetic-devel) |
+| Buildfarm src | [![buildfarm](http://build.ros.org/buildStatus/icon?job=Ksrc_uX__pilz_robots__ubuntu_xenial__source)](http://build.ros.org/view/Ksrc_uX/job/Ksrc_uX__pilz_robots__ubuntu_xenial__source/) | [![buildfarm](http://build.ros.org/buildStatus/icon?job=Msrc_uB__pilz_robots__ubuntu_bionic__source)](http://build.ros.org/view/Msrc_uB/job/Msrc_uB__pilz_robots__ubuntu_bionic__source/) | coming soon |
+| Buildfarm bin | [![buildfarm](http://build.ros.org/buildStatus/icon?job=Kbin_uX64__pilz_robots__ubuntu_xenial_amd64__binary)](http://build.ros.org/view/Kbin_uX64/job/Kbin_uX64__pilz_robots__ubuntu_xenial_amd64__binary/) | [![buildfarm](http://build.ros.org/buildStatus/icon?job=Mbin_uB64__pilz_robots__ubuntu_bionic_amd64__binary)](http://build.ros.org/view/Mbin_uB64/job/Mbin_uB64__pilz_robots__ubuntu_bionic_amd64__binary/)| coming soon |
+
+
+#### Branching model
+`noetic-devel` is considered to be the active development branch.
+Relevant changes are cherry-picked into `melodic-devel` or `kinetic-devel` on a case-by-case basis.
+
 
 ### Supported hardware versions
 PRBT firmware version 1.1.0

diff --git a/pilz_control/CHANGELOG.rst b/pilz_control/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package pilz_control
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Prepare first-time noetic release
+* Fix update routine in unittest of PilzJointTrajectoryController
+* Contributors: Pilz GmbH and Co. KG
+
 0.5.21 (2020-11-23)
 -------------------
 

diff --git a/pilz_robots/CHANGELOG.rst b/pilz_robots/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package pilz_robots
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Prepare first-time noetic release
+* Contributors: Pilz GmbH and Co. KG
+
 0.5.21 (2020-11-23)
 -------------------
 

diff --git a/pilz_status_indicator_rqt/CHANGELOG.rst b/pilz_status_indicator_rqt/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package pilz_status_indicator_rqt
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Prepare first-time noetic release
+* Contributors: Pilz GmbH and Co. KG
+
 0.5.21 (2020-11-23)
 -------------------
 * Update references to OperationMode msg and GetOperationMode srv (moved to pilz_msgs)

diff --git a/prbt_gazebo/CHANGELOG.rst b/prbt_gazebo/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package prbt_gazebo
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Prepare first-time noetic release
+* Contributors: Pilz GmbH and Co. KG
+
 0.5.21 (2020-11-23)
 -------------------
 

diff --git a/prbt_hardware_support/CHANGELOG.rst b/prbt_hardware_support/CHANGELOG.rst
@@ -4,7 +4,9 @@ Changelog for package prbt_hardware_support
 
 Forthcoming
 -----------
-* changing references from pilz_command_planner to pilz_industrial_motion_planner
+* Prepare first-time noetic release
+* Change references from pilz_command_planner to pilz_industrial_motion_planner
+* Contributors: Pilz GmbH and Co. KG
 
 0.5.21 (2020-11-23)
 -------------------

diff --git a/prbt_moveit_config/CHANGELOG.rst b/prbt_moveit_config/CHANGELOG.rst
@@ -4,7 +4,9 @@ Changelog for package prbt_moveit_config
 
 Forthcoming
 -----------
-* changing references from pilz_command_planner to pilz_industrial_motion_planner
+* Prepare first-time noetic release
+* Change references from pilz_command_planner to pilz_industrial_motion_planner
+* Contributors: Pilz GmbH and Co. KG
 
 0.5.21 (2020-11-23)
 -------------------

diff --git a/prbt_support/CHANGELOG.rst b/prbt_support/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package prbt_support
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Prepare first-time noetic release
+* Contributors: Pilz GmbH and Co. KG
+
 0.5.21 (2020-11-23)
 -------------------