diff --git a/action.yml b/action.yml
index 59e5a01..51bfe9b 100644
--- a/action.yml
+++ b/action.yml
@@ -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:
@@ -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
diff --git a/travis.sh b/travis.sh
index becf753..b207dcd 100755
--- a/travis.sh
+++ b/travis.sh
@@ -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
diff --git a/travis_jenkins.py b/travis_jenkins.py
index 2300cf1..fe1f885 100755
--- a/travis_jenkins.py
+++ b/travis_jenkins.py
@@ -212,7 +212,7 @@
- TIMEOUT_JENKINS
+ TIEMOUT_MINUTES
120
@@ -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
@@ -464,7 +464,7 @@
- %(TIMEOUT_JENKINS)s
+ %(TIEMOUT_MINUTES)s
@@ -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
@@ -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)
@@ -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
})
@@ -801,7 +801,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())