Skip to content
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

(PA-4718) Updates for Solaris and agent-runtime-main #688

Conversation

cthorn42
Copy link
Collaborator

This PR updates Solaris on agent-runtime-main to:

  • Build libffi, with gmake
  • Build Ruby 3.2.2 with OpenCSW gcc
  • Configure rubygem-ffi, but still expected to fail. rubygem-ffi will be fixed at a later point
  • Also installs a new GCC and autotools as part of the image.

@cthorn42 cthorn42 requested review from a team as code owners June 29, 2023 22:48
Copy link
Contributor

@mhashizume mhashizume left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you may have to update master and rebase but otherwise LGTM 👍

@joshcooper
Copy link
Contributor

Looks to be an empty merge commit in your feature branch. I'd try rebasing on upstream, which should drop the extra merge commit:

git fetch upstream
git rebase 1a77733 --onto upstream/master
git push -f origin HEAD

@cthorn42 cthorn42 force-pushed the maint/master/PA-4718_solaris-11-x86_64_updates_for_ruby_3 branch from f683dad to 2d30b44 Compare July 5, 2023 20:18
if platform.is_cross_compiled_linux? || platform.is_solaris?
pkg.environment "PATH", "/opt/pl-build-tools/bin:/opt/csw/bin:$(PATH)"
if settings[:runtime_project] == 'agent-runtime-main'
if platform.is_cross_compiled_linux? || platform.is_solaris?
Copy link
Contributor

@joshcooper joshcooper Jul 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Due to the order of these if's, we no longer override PATH when compiling agent-runtime-7.x on cross compiled linux or solaris:

$ bundle exec rake vanagon:component_diff -- -P agent-runtime-7.x -p solaris-10-sparc --from HEAD^ --to HEAD
...

Project agent-runtime-7.x

Platform name: solaris-10-sparc
    Component 'rubygem-ffi'
        Field: environment
        --------------------
        - GEM_HOME=/opt/puppetlabs/puppet/lib/ruby/gems/2.7.0 GEM_PATH=/opt/puppetlabs/puppet/lib/ruby/gems/2.7.0 RUBYLIB=/opt/puppetlabs/puppet/lib/ruby/vendor_ruby:$(RUBYLIB) MAKE=/opt/csw/bin/gmake PATH=/opt/pl-build-tools/bin:/opt/csw/bin:$(PATH)
        + GEM_HOME=/opt/puppetlabs/puppet/lib/ruby/gems/2.7.0 GEM_PATH=/opt/puppetlabs/puppet/lib/ruby/gems/2.7.0 RUBYLIB=/opt/puppetlabs/puppet/lib/ruby/vendor_ruby:$(RUBYLIB) MAKE=/opt/csw/bin/gmake

Maybe something like?

Suggested change
if platform.is_cross_compiled_linux? || platform.is_solaris?
if platform.is_cross_compiled_linux?
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
elsif platform.is_solaris?
if settings[:runtime_project] == 'agent-runtime-main'
pkg.environment "PATH", "/opt/csw/bin:/opt/pl-build-tools/bin:$(PATH)"
else
pkg.environment "PATH", "/opt/pl-build-tools/bin:/opt/csw/bin:$(PATH)"
end
end

This PR updates Solaris on agent-runtime-main to:

* Build libffi, with gmake
* Build Ruby 3.2.2 with OpenCSW gcc
* Configure rubygem-ffi, but still expected to fail. rubygem-ffi will be
fixed at a later point
* Also installs a new GCC and autotools as part of the image.
@cthorn42 cthorn42 force-pushed the maint/master/PA-4718_solaris-11-x86_64_updates_for_ruby_3 branch from 2d30b44 to 827c11f Compare July 6, 2023 02:19
Copy link
Contributor

@joshcooper joshcooper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$ bundle exec rake vanagon:component_diff -- -P agent-runtime-main -p all --from HEAD^ --to HEAD  | grep 'Platform name'
Platform name: solaris-11-sparc
Platform name: sles-12-ppc64le
Platform name: solaris-10-i386
Platform name: el-7-ppc64le
Platform name: el-7-ppc64
Platform name: solaris-11-i386
Platform name: solaris-10-sparc

Of those, {el-7,sles-12}-ppc* are not actually supported and can be ignored (and will be removed in other tickets)

@joshcooper joshcooper merged commit a17e694 into puppetlabs:master Jul 6, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants