Jenkins rm duplicate sitl build node def, don't checkout scm for S3 upload

This commit is contained in:
Anthony Lamping
2018-06-12 18:20:00 -04:00
committed by Daniel Agar
parent fc2e7e4dc4
commit aa625d9af8
Vendored
+4 -3
View File
@@ -64,7 +64,6 @@ pipeline {
builds[node_name] = createBuildNode(docker_nuttx, "${node_name}_default") builds[node_name] = createBuildNode(docker_nuttx, "${node_name}_default")
} }
builds["sitl"] = createBuildNode(docker_base, 'posix_sitl_default')
builds["sitl_rtps"] = createBuildNode(docker_base, 'posix_sitl_rtps') builds["sitl_rtps"] = createBuildNode(docker_base, 'posix_sitl_rtps')
builds["sitl (GCC 7)"] = createBuildNode(docker_arch, 'posix_sitl_default') builds["sitl (GCC 7)"] = createBuildNode(docker_arch, 'posix_sitl_default')
@@ -678,11 +677,14 @@ pipeline {
} }
} }
// TODO: actually upload artifacts to S3
stage('S3 Upload') { stage('S3 Upload') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-03-30' } docker { image 'px4io/px4-dev-base:2018-03-30' }
} }
options {
skipDefaultCheckout()
}
when { when {
anyOf { anyOf {
branch 'master' branch 'master'
@@ -690,7 +692,6 @@ pipeline {
branch 'stable' branch 'stable'
} }
} }
steps { steps {
sh 'echo "uploading to S3"' sh 'echo "uploading to S3"'
} }