Skip to content

Commit 565535b

Browse files
committed
Update ici config with host-mounted urcap storage and test upload
This is a requirement for running URCap-based tests in the ROS driver.
1 parent 8a62355 commit 565535b

1 file changed

Lines changed: 23 additions & 1 deletion

File tree

.github/workflows/industrial-ci.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,28 @@ jobs:
3232
- main
3333
- testing
3434
env:
35-
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
35+
# /tmp/ur_test_artifacts: collection point for test artifacts (e.g. VNC
36+
# snapshots) written from inside the ICI container.
37+
# /tmp/ursim_urcaps: shared storage for the External Control URCap.
38+
# Mounted at the same path in the ICI container AND used as the bind
39+
# source for the URSim container that start_ursim.sh launches via the
40+
# host docker daemon, so the URCap downloaded inside the ICI container
41+
# is actually visible to URSim's /urcaps mount.
42+
# Both paths are kept outside ${{ github.workspace }} so they do not
43+
# collide with industrial_ci's read-only bind-mount of TARGET_REPO_PATH.
44+
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock -v /tmp/ur_test_artifacts:/test_artifacts -v /tmp/ursim_urcaps:/tmp/ursim_urcaps -e UR_TEST_ARTIFACTS_DIR=/test_artifacts -e UR_CI_URCAP_FOLDER=/tmp/ursim_urcaps --network ursim_net --ip 192.168.56.1'
3645
steps:
3746
- uses: actions/checkout@v7
3847
- run: docker network create --subnet=192.168.56.0/24 ursim_net
3948
if: ${{ !env.ACT }}
49+
- name: Create shared host directories
50+
run: |
51+
mkdir -p /tmp/ur_test_artifacts /tmp/ursim_urcaps
52+
# Allow the container (running as root) to write here while keeping
53+
# the directory readable by the runner user for upload-artifact, and
54+
# writable by the host docker daemon when it bind-mounts /tmp/ursim_urcaps
55+
# into the URSim container.
56+
chmod 777 /tmp/ur_test_artifacts /tmp/ursim_urcaps
4057
- uses: 'ros-industrial/industrial_ci@master'
4158
env:
4259
IMMEDIATE_TEST_OUTPUT: true
@@ -47,3 +64,8 @@ jobs:
4764
ROS_REPO: ${{matrix.ROS_REPO}}
4865
CLANG_TIDY: ${{matrix.ROS_DISTRO.CLANG_TIDY}}
4966
OS_CODE_NAME: ${{matrix.ROS_DISTRO.OS_CODE_NAME}}
67+
- name: Upload test artifacts
68+
uses: actions/upload-artifact@v7
69+
with:
70+
name: ur_test_artifacts-${{matrix.ROS_DISTRO.NAME}}-${{matrix.ROS_REPO}}
71+
path: /tmp/ur_test_artifacts

0 commit comments

Comments
 (0)