Skip to content

Commit 9710d1f

Browse files
author
Felix Exner
committed
Fix docker network name in tests
1 parent 75d78c7 commit 9710d1f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
strategy:
99
matrix:
1010
env:
11-
- DOCKER_RUN_OPTS: --network static_test_net
11+
- DOCKER_RUN_OPTS: --network ursim_net
1212
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
1313
CTEST_OUTPUT_ON_FAILURE: 1
1414
ROBOT_MODEL: 'ur5'
1515
URSIM_VERSION: '3.12.1'
1616
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/cb3'
17-
- DOCKER_RUN_OPTS: --network static_test_net
17+
- DOCKER_RUN_OPTS: --network ursim_net
1818
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
1919
CTEST_OUTPUT_ON_FAILURE: 1
2020
ROBOT_MODEL: 'ur5e'

.github/workflows/industrial-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
ROS_REPO: main
2424
IMMEDIATE_TEST_OUTPUT: true
2525
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS_Driver#master https://raw.githubusercontent.com/UniversalRobots/Universal_Robots_ROS_Driver/master/.melodic.rosinstall"
26-
DOCKER_RUN_OPTS: --network static_test_net
26+
DOCKER_RUN_OPTS: --network ursim_net
2727
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
2828
URSIM_VERSION: '5.5.1'
2929
ROBOT_MODEL: 'ur5e'
@@ -33,7 +33,7 @@ jobs:
3333
IMMEDIATE_TEST_OUTPUT: true
3434
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS_Driver#master https://raw.githubusercontent.com/UniversalRobots/Universal_Robots_ROS_Driver/master/.noetic.rosinstall"
3535
BUILDER: catkin_tools
36-
DOCKER_RUN_OPTS: --network static_test_net
36+
DOCKER_RUN_OPTS: --network ursim_net
3737
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
3838
URSIM_VERSION: '5.5.1'
3939
ROBOT_MODEL: 'ur5e'
@@ -42,7 +42,7 @@ jobs:
4242
ROS_REPO: main
4343
IMMEDIATE_TEST_OUTPUT: true
4444
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#foxy"
45-
DOCKER_RUN_OPTS: --network static_test_net
45+
DOCKER_RUN_OPTS: --network ursim_net
4646
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
4747
URSIM_VERSION: '5.5.1'
4848
ROBOT_MODEL: 'ur5e'
@@ -52,7 +52,7 @@ jobs:
5252
ROS_REPO: main
5353
IMMEDIATE_TEST_OUTPUT: true
5454
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#galactic"
55-
DOCKER_RUN_OPTS: --network static_test_net
55+
DOCKER_RUN_OPTS: --network ursim_net
5656
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
5757
URSIM_VERSION: '5.5.1'
5858
ROBOT_MODEL: 'ur5e'
@@ -62,7 +62,7 @@ jobs:
6262
ROS_REPO: main
6363
IMMEDIATE_TEST_OUTPUT: true
6464
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#main https://raw.githubusercontent.com/UniversalRobots/Universal_Robots_ROS2_Driver/main/Universal_Robots_ROS2_Driver-not-released.humble.repos"
65-
DOCKER_RUN_OPTS: --network static_test_net
65+
DOCKER_RUN_OPTS: --network ursim_net
6666
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
6767
URSIM_VERSION: '5.5.1'
6868
ROBOT_MODEL: 'ur5e'
@@ -72,7 +72,7 @@ jobs:
7272
ROS_REPO: main
7373
IMMEDIATE_TEST_OUTPUT: true
7474
DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#main https://raw.githubusercontent.com/UniversalRobots/Universal_Robots_ROS2_Driver/main/Universal_Robots_ROS2_Driver-not-released.rolling.repos"
75-
DOCKER_RUN_OPTS: --network static_test_net
75+
DOCKER_RUN_OPTS: --network ursim_net
7676
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
7777
URSIM_VERSION: '5.5.1'
7878
ROBOT_MODEL: 'ur5e'

0 commit comments

Comments
 (0)