From 13831806fe3d2c69aeb4ec943d57df00841003e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= Date: Thu, 16 Mar 2017 20:55:54 +0100 Subject: [PATCH] use PRERELEASE_REPONAME instead of TARGET_REPO_NAME --- .travis.yml | 2 +- industrial_ci/src/tests/ros_prerelease.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d040accf..aee24da6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ env: - ROS_DISTRO=indigo CATKIN_PARALLEL_JOBS='-p1' ROS_PARALLEL_JOBS='-j1' # Intend build on low-power platform # - env: ROS_DISTRO=indigo PRERELEASE=true ## Comment out because this is meaningless for always failing without prerelease testable contents in industrial_ci. - ROS_DISTRO=indigo PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=1 - - ROS_DISTRO=kinetic PRERELEASE=true PRERELEASE_REPONAME=std_msgs + - ROS_DISTRO=kinetic PRERELEASE=true PRERELEASE_REPONAME=industrial_ci - ROS_DISTRO=indigo APTKEY_STORE_SKS=hkp://ha.pool.sks-keyservers.vet # Passing wrong SKS URL as a break test. Should still pass. - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=debian - ROS_DISTRO=indigo UPSTREAM_WORKSPACE=file # Using default file name for ROSINSTALL_FILENAME diff --git a/industrial_ci/src/tests/ros_prerelease.sh b/industrial_ci/src/tests/ros_prerelease.sh index a20571f61..917ac4f20 100644 --- a/industrial_ci/src/tests/ros_prerelease.sh +++ b/industrial_ci/src/tests/ros_prerelease.sh @@ -70,8 +70,9 @@ function run_ros_prerelease() { ici_time_start setup_prerelease_scripts mkdir -p "$WORKSPACE/catkin_workspace/src/" local reponame=${PRERELEASE_REPONAME:-$TARGET_REPO_NAME} - cp -a "$TARGET_REPO_PATH" "$WORKSPACE/catkin_workspace/src/$TARGET_REPO_NAME" - run_in_prerelease_docker generate_prerelease_script.py https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/production/index.yaml "$ROS_DISTRO" default ubuntu "$UBUNTU_OS_CODE_NAME" amd64 "${reponame}" --level "$downstream_depth" --output-dir . --custom-repo $TARGET_REPO_NAME:git:file://$TARGET_REPO_PATH:HEAD + cp -a "$TARGET_REPO_PATH" "$WORKSPACE/catkin_workspace/src/$reponame" + + run_in_prerelease_docker generate_prerelease_script.py https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/production/index.yaml "$ROS_DISTRO" default ubuntu "$UBUNTU_OS_CODE_NAME" amd64 --level "$downstream_depth" --output-dir . --custom-repo "$reponame::::" ici_time_end # setup_prerelease_scripts ici_time_start prerelease.sh