Skip to content

Commit cbacb49

Browse files
committed
Merge branch 'studio-16-core-runner' into merge-studio-main
2 parents 6bd1df6 + 8888e98 commit cbacb49

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

.github/workflows/workspace_integration_test.yaml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
default: main
99
config_package:
1010
type: string
11-
default: picknik_ur_mock_hw_config
11+
default: lab_sim
1212
colcon_build_args:
1313
type: string
1414
default: ""
@@ -23,17 +23,14 @@ jobs:
2323
setup:
2424
runs-on: ubuntu-latest
2525
outputs:
26-
# We return the main image_tag since we can no longer get it from the deprecated .env file
2726
image_tag: ${{ inputs.image_tag }}
2827
steps:
2928
- uses: actions/checkout@v4
3029
integration-test-in-studio-container:
3130
needs: setup
32-
runs-on: ubuntu-latest
31+
runs-on: studio_16_core_runner
3332
env:
3433
STUDIO_LICENSE_KEY: ${{ secrets.studio_license_key || secrets.STUDIO_CI_LICENSE_KEY }}
35-
ROS_DOMAIN_ID: 49
36-
ROS_LOCALHOST_ONLY: 1
3734
RMW_IMPLEMENTATION: rmw_cyclonedds_cpp
3835
CYCLONEDDS_URI: /tmp/cyclonedds.xml
3936
STUDIO_DOCKER_TAG: ${{ inputs.image_tag }}
@@ -54,19 +51,29 @@ jobs:
5451
- uses: actions/checkout@v4
5552
with:
5653
submodules: recursive
54+
lfs: true
5755
# The 'lo' interfaces will not have multicast, and will fail trying to claim a participant index
5856
# with the default cyclone dds config. We set one for the unit tests to be able to execute.
5957
- name: Configure DDS
6058
run: |
6159
cat <<EOF > /tmp/cyclonedds.xml
6260
<?xml version="1.0" ?>
6361
<CycloneDDS xmlns="https://cdds.io/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://cdds.io/config https://raw.githubusercontent.com/eclipse-cyclonedds/cyclonedds/master/etc/cyclonedds.xsd">
64-
<Domain id="any">
65-
<Discovery>
66-
<ParticipantIndex>auto</ParticipantIndex>
67-
<MaxAutoParticipantIndex>120</MaxAutoParticipantIndex>
68-
</Discovery>
69-
</Domain>
62+
<Domain id="any">
63+
<General>
64+
<Interfaces>
65+
<NetworkInterface autodetermine="true"/>
66+
</Interfaces>
67+
<AllowMulticast>false</AllowMulticast>
68+
</General>
69+
<Discovery>
70+
<ParticipantIndex>auto</ParticipantIndex>
71+
<Peers>
72+
<Peer Address="127.0.0.1" />
73+
</Peers>
74+
<MaxAutoParticipantIndex>50</MaxAutoParticipantIndex>
75+
</Discovery>
76+
</Domain>
7077
</CycloneDDS>
7178
EOF
7279
- name: Install colcon mixins

0 commit comments

Comments
 (0)