-
Notifications
You must be signed in to change notification settings - Fork 36
Enable ARM jobs for Connext RMW #853
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.
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
base: master
Are you sure you want to change the base?
Changes from 1 commit
adeeaf1
59f5573
a61e6f7
e776201
a0e60e4
c5c7036
2055511
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,8 +25,8 @@ echo "done." | |
| . /etc/os-release | ||
| VERSION_ID_MAJOR=$(echo $VERSION_ID | sed 's/\..*//') | ||
|
|
||
| # We only attempt to install Connext on Ubuntu amd64 | ||
| if [ "${ARCH}" = "x86_64" -a "${ID}" = "ubuntu" ]; then | ||
| # We only attempt to install Connext on Ubuntu amd64 or aarch64 | ||
| if [ "${ID}" = "ubuntu" ]; then | ||
| IGNORE_CONNEXTDDS="" | ||
| ignore_rwm_seen="false" | ||
| for arg in ${CI_ARGS} ; do | ||
|
|
@@ -50,13 +50,22 @@ if [ "${ARCH}" = "x86_64" -a "${ID}" = "ubuntu" ]; then | |
|
|
||
| case "${CI_ARGS}" in | ||
| *--connext-debs*) | ||
| # Installing Connext through Debian packages is supported on both x86_64 and aarch64 architectures. If we're on an unsupported architecture, skip the installation and exit with an error. | ||
| echo "Using Debian package of Connext" | ||
| if test -r /opt/rti.com/rti_connext_dds-${CONNEXT_DISPLAY_VERSION}/resource/scripts/rtisetenv_x64Linux4gcc7.3.0.sh; then | ||
| echo "Sourcing RTI setenv script /opt/rti.com/rti_connext_dds-${CONNEXT_DISPLAY_VERSION}/resource/scripts/rtisetenv_x64Linux4gcc7.3.0.sh" | ||
| . /opt/rti.com/rti_connext_dds-${CONNEXT_DISPLAY_VERSION}/resource/scripts/rtisetenv_x64Linux4gcc7.3.0.sh | ||
| fi | ||
| ;; | ||
| *) | ||
| # Support for installing Connext through the RTI website installers is only supported on | ||
| # x86_64 architecture. If we're on a different architecture, skip the installation and | ||
| # exit with an error. | ||
| if [ "${ARCH}" != "x86_64" ]; then | ||
| echo "Connext is only supported on amd64 architecture. Skipping Connext installation." >&2 | ||
| exit 1 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Existing behavior is to quietly skip connext installation on aarch64 even if requested. While this PR enables the deb installation scenario, I think we should continue the existing behavior and not fail the build if non-deb installation is requested. The main scenario here is that someone might trigger a job from the launcher that uses the non-deb Connext installation. I don't think it would be a good experience if the aarch64 builds suddenly start failing and require re-running with connext disabled.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are a couple of places where we do
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
It's totally appropriate to raise a critical error if something is expected to work and doesn't. This case is different though - it's not supported and is not expected to work, and the previous behavior for that scenario (requesting Connext via binaries on arm64) was to quietly continue the build.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I refactored the Connext installation into a new function, maintaining the same behavior as before. Let me know what you think and launch a validation as soon as you feel okay with the code. |
||
| fi | ||
|
|
||
| echo "Installing Connext binaries off RTI website..." | ||
| if test -x /tmp/rticonnextdds-src/rti_connext_dds-${CONNEXT_DISPLAY_VERSION}-pro-host-x64Linux.run; then | ||
| rtipkg_list="\ | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.