From 3959180a2eec82310f92eab8bcb76f41f7cec16d Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Tue, 5 Feb 2019 21:37:15 -0500
Subject: [PATCH] Jenkins PX4 ROS deploy steps cleanup first
---
Jenkinsfile | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bf255aaeb8..64bd03d33a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -500,8 +500,8 @@ pipeline {
docker { image 'px4io/px4-dev-base:2019-01-27' }
}
steps {
- checkout(scm)
sh('export')
+ sh('make distclean')
withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git -b ${BRANCH_NAME}")
sh('python msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
@@ -516,9 +516,6 @@ pipeline {
branch 'pr-jenkins' // for testing
}
}
- options {
- skipDefaultCheckout()
- }
}
stage('PX4 ROS2 bridge') {
@@ -526,8 +523,8 @@ pipeline {
docker { image 'px4io/px4-dev-base:2019-01-27' }
}
steps {
- checkout(scm)
sh('export')
+ sh('make distclean')
withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_ros_com.git -b ${BRANCH_NAME}")
// deploy uORB RTPS ID map
@@ -550,9 +547,6 @@ pipeline {
branch 'pr-jenkins' // for testing
}
}
- options {
- skipDefaultCheckout()
- }
}
stage('S3') {
--
GitLab