Skip to content

Commit

Permalink
use PRERELEASE_REPONAME instead of TARGET_REPO_NAME
Browse files Browse the repository at this point in the history
  • Loading branch information
mathias-luedtke committed Mar 16, 2017
1 parent 9039b95 commit 1383180
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions industrial_ci/src/tests/ros_prerelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1383180

Please sign in to comment.