Jenkins CI: PX4 ROS msgs stage: properly name the ros1 branch

This commit is contained in:
TSC21
2019-02-14 16:23:01 +00:00
committed by Nuno Marques
parent d1182f18ed
commit d4570e10f3
Vendored
+3 -3
View File
@@ -511,17 +511,17 @@ pipeline {
sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true') sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
sh('cd px4_msgs; git push origin master || true') sh('cd px4_msgs; git push origin master || true')
// 'ros1' branch // 'ros1' branch
sh('cd px4_msgs; git checkout feature/deploy_ros1_msgs') sh('cd px4_msgs; git checkout ros1')
sh('python msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/') sh('python msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true') sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
sh('cd px4_msgs; git push origin feature/deploy_ros1_msgs || true') sh('cd px4_msgs; git push origin ros1 || true')
sh('rm -rf px4_msgs') sh('rm -rf px4_msgs')
} }
} }
when { when {
anyOf { anyOf {
branch 'master' branch 'master'
branch 'feature/deploy_ros1_msgs' // for testing branch 'pr-jenkins' // for testing
} }
} }
} }