Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TIMEOUT_JENKINS -> TIMEOUT_MINUTES: use this value in github/travis too #447

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TIMEOUT_JENKINS -> TIMEOUT_MINUTES: use this value in github/travis too #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ inputs:
description: >
Docker image used in Jenkins., (defualt:
`ros-ubuntu:$(lsb_release -sr)`)
TIMEOUT_JENKINS:
TIMEOUT_MINUTES:
description: >
Timeout minutes in Jenkins., (defualt: 120)
EXTRA_DEB:
Expand Down Expand Up @@ -159,7 +159,7 @@ runs:
if [[ "${{ inputs.CMAKE_DEVELOPER_ERROR }}" != "" ]]; then export CMAKE_DEVELOPER_ERROR="${{ inputs.CMAKE_DEVELOPER_ERROR }}"; fi
if [[ "${{ inputs.DEBUG_TRAVIS_PYTHON }}" != "" ]]; then export DEBUG_TRAVIS_PYTHON="${{ inputs.DEBUG_TRAVIS_PYTHON }}"; fi
if [[ "${{ inputs.DOCKER_IMAGE_JENKINS }}" != "" ]]; then export DOCKER_IMAGE_JENKINS="${{ inputs.DOCKER_IMAGE_JENKINS }}"; fi
if [[ "${{ inputs.TIMEOUT_JENKINS }}" != "" ]]; then export TIMEOUT_JENKINS="${{ inputs.TIMEOUT_JENKINS }}"; fi
if [[ "${{ inputs.TIEMOUT_MINUTES }}" != "" ]]; then export TIEMOUT_MINUTES="${{ inputs.TIEMOUT_MINUTES }}"; fi
if [[ "${{ inputs.EXTRA_DEB }}" != "" ]]; then export EXTRA_DEB="${{ inputs.EXTRA_DEB }}"; fi
if [[ "${{ inputs.NOT_TEST_INSTALL }}" != "" ]]; then export NOT_TEST_INSTALL="${{ inputs.NOT_TEST_INSTALL }}"; fi
if [[ "${{ inputs.ROSDEP_ADDITIONAL_OPTIONS }}" != "" ]]; then export ROSDEP_ADDITIONAL_OPTIONS="${{ inputs.ROSDEP_ADDITIONAL_OPTIONS }}"; fi
Expand Down
2 changes: 1 addition & 1 deletion travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ else
# - https://github.com/catkin/catkin_tools/issues/405
# - https://github.com/ros-planning/moveit_ci/pull/18
#travis_wait 60 catkin run_tests -i --no-deps --no-status $TEST_PKGS $CATKIN_PARALLEL_TEST_JOBS --make-args $ROS_PARALLEL_TEST_JOBS $CMAKE_ARGS_FLAGS --
travis_wait 60 catkin build --catkin-make-args run_tests -- -i --no-deps --no-status $TEST_PKGS $CATKIN_PARALLEL_TEST_JOBS --make-args $ROS_PARALLEL_TEST_JOBS $CMAKE_ARGS_FLAGS --
travis_wait $TIMEOUT_MINUTES catkin build --catkin-make-args run_tests -- -i --no-deps --no-status $TEST_PKGS $CATKIN_PARALLEL_TEST_JOBS --make-args $ROS_PARALLEL_TEST_JOBS $CMAKE_ARGS_FLAGS --
fi

travis_time_end
Expand Down
14 changes: 7 additions & 7 deletions travis_jenkins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
<defaultValue></defaultValue>
</hudson.model.TextParameterDefinition>
<hudson.model.TextParameterDefinition>
<name>TIMEOUT_JENKINS</name>
<name>TIEMOUT_MINUTES</name>
<description></description>
<defaultValue>120</defaultValue>
</hudson.model.TextParameterDefinition>
Expand Down Expand Up @@ -330,7 +330,7 @@
echo "TRAVIS_BUILD_WEB_URL : $TRAVIS_BUILD_WEB_URL"
echo "TRAVIS_JOB_WEB_URL : $TRAVIS_JOB_WEB_URL"
echo "DOCKER_IMAGE_JENKINS : $DOCKER_IMAGE_JENKINS"
echo "TIMEOUT_JENKINS : $TIMEOUT_JENKINS"
echo "TIEMOUT_MINUTES : $TIEMOUT_MINUTES"
echo "ADD_ENV_VALUE_TO_DOCKER : $ADD_ENV_VALUE_TO_DOCKER"

travis_time_start setup_cache
Expand Down Expand Up @@ -464,7 +464,7 @@
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
<hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@%(TIMEOUT_PLUGIN_VERSION)s">
<strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy">
<timeoutMinutes>%(TIMEOUT_JENKINS)s</timeoutMinutes>
<timeoutMinutes>%(TIEMOUT_MINUTES)s</timeoutMinutes>
</strategy>
<operationList>
<hudson.plugins.build__timeout.operations.FailOperation/>
Expand Down Expand Up @@ -617,7 +617,7 @@ def wait_for_building(name, number):
UBUNTU_DISTRO = 'trusty'

DOCKER_IMAGE_JENKINS = env.get('DOCKER_IMAGE_JENKINS', 'ros-ubuntu:%s-base' % LSB_RELEASE)
TIMEOUT_JENKINS = env.get('TIMEOUT_JENKINS','120')
TIEMOUT_MINUTES = env.get('TIEMOUT_MINUTES','120')

print('''
TRAVIS_BRANCH = %(TRAVIS_BRANCH)s
Expand Down Expand Up @@ -654,7 +654,7 @@ def wait_for_building(name, number):
TRAVIS_BUILD_WEB_URL = %(TRAVIS_BUILD_WEB_URL)s
TRAVIS_JOB_WEB_URL = %(TRAVIS_JOB_WEB_URL)s
DOCKER_IMAGE_JENKINS = %(DOCKER_IMAGE_JENKINS)s
TIMEOUT_JENKINS = %(TIMEOUT_JENKINS)s
TIEMOUT_MINUTES = %(TIEMOUT_MINUTES)s
ADD_ENV_VALUE_TO_DOCKER = %(ADD_ENV_VALUE_TO_DOCKER)s
''' % locals(), file=sys.stderr)

Expand Down Expand Up @@ -728,7 +728,7 @@ def wait_for_building(name, number):
'TRAVIS_BUILD_WEB_URL':TRAVIS_BUILD_WEB_URL,
'TRAVIS_JOB_WEB_URL':TRAVIS_JOB_WEB_URL,
'DOCKER_IMAGE_JENKINS':DOCKER_IMAGE_JENKINS,
'TIMEOUT_JENKINS':TIMEOUT_JENKINS,
'TIEMOUT_MINUTES':TIEMOUT_MINUTES,
'ADD_ENV_VALUE_TO_DOCKER':ADD_ENV_VALUE_TO_DOCKER
})

Expand Down Expand Up @@ -801,7 +801,7 @@ def wait_for_building(name, number):
TRAVIS_BUILD_WEB_URL = %(TRAVIS_BUILD_WEB_URL)s <br> \
TRAVIS_JOB_WEB_URL = %(TRAVIS_JOB_WEB_URL)s <br> \
DOCKER_IMAGE_JENKINS = %(DOCKER_IMAGE_JENKINS)s <br> \
TIMEOUT_JENKINS = %(TIMEOUT_JENKINS)s <br> \
TIEMOUT_MINUTES = %(TIEMOUT_MINUTES)s <br> \
ADD_ENV_VALUE_TO_DOCKER = %(ADD_ENV_VALUE_TO_DOCKER)s <br> \
') % locals())

Expand Down