-
Notifications
You must be signed in to change notification settings - Fork 87
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-5998) Enable puppet-runtime builds for sles11-main #795
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For agent-runtime-7.x, the prder of PATH
and PKG_CONFIG_PATH
are flipped on AIX 7.x, but that's fine:
$ bundle exec rake vanagon:component_diff -- -P agent-runtime-7.x -p all --from upstream/master --to HEAD
...
Project agent-runtime-7.x
Platform name: sles-11-x86_64
Component 'ruby-augeas'
Field: environment
--------------------
- PATH=$(PATH):/opt/pl-build-tools/bin:/usr/local/bin:/opt/csw/bin:/usr/ccs/bin:/usr/sfw/bin CONFIGURE_ARGS=--vendor PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:/usr/lib/pkgconfig
+ PATH=/opt/pl-build-tools/bin:$(PATH) CONFIGURE_ARGS=--vendor PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:/usr/lib/pkgconfig
Component 'ruby-shadow'
Field: environment
--------------------
- PATH=$(PATH):/usr/ccs/bin:/usr/sfw/bin CONFIGURE_ARGS=--vendor
+ PATH=/opt/pl-build-tools/bin:$(PATH) CONFIGURE_ARGS=--vendor
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) PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_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) PATH=/opt/pl-build-tools/bin:$(PATH) PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH)
Component 'runtime-agent'
Field: install[0]
--------------------
+ zypper install -y --oldpackage pl-gcc=4.8.2-1
Platform name: aix-7.2-ppc
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) PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH) PATH=/opt/freeware/bin:/opt/pl-build-tools/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) PATH=/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH) PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH)
Platform name: aix-7.1-ppc
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) PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH) PATH=/opt/freeware/bin:/opt/pl-build-tools/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) PATH=/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH) PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH)
For agent-runtime-main, same thing:
$ bundle exec rake vanagon:component_diff -- -P agent-runtime-main -p all --from upstream/master --to HEAD
...
Project agent-runtime-main
Platform name: sles-11-x86_64
Component 'ruby-3.2.3'
Field: configure[1]
--------------------
- ["bash configure --enable-shared --disable-install-doc --disable-install-rdoc --prefix=/opt/puppetlabs/puppet --with-opt-dir=/opt/puppetlabs/puppet --enable-dtrace "]
+ ["bash configure --enable-shared --disable-install-doc --disable-install-rdoc --prefix=/opt/puppetlabs/puppet --with-opt-dir=/opt/puppetlabs/puppet --with-baseruby=no "]
Field: environment
--------------------
- optflags=-O2
+ PATH=/opt/pl-build-tools/bin:$(PATH) optflags=-O2
Component 'ruby-augeas'
Field: environment
--------------------
- PATH=$(PATH):/opt/pl-build-tools/bin:/usr/local/bin:/opt/csw/bin:/usr/ccs/bin:/usr/sfw/bin CONFIGURE_ARGS=--vendor PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:/usr/lib/pkgconfig
+ PATH=/opt/pl-build-tools/bin:$(PATH) CONFIGURE_ARGS=--vendor PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:/usr/lib/pkgconfig
Component 'ruby-shadow'
Field: environment
--------------------
- PATH=$(PATH):/usr/ccs/bin:/usr/sfw/bin CONFIGURE_ARGS=--vendor
+ PATH=/opt/pl-build-tools/bin:$(PATH) CONFIGURE_ARGS=--vendor
Component 'rubygem-ffi'
Field: environment
--------------------
- GEM_HOME=/opt/puppetlabs/puppet/lib/ruby/gems/3.2.0 GEM_PATH=/opt/puppetlabs/puppet/lib/ruby/gems/3.2.0 RUBYLIB=/opt/puppetlabs/puppet/lib/ruby/vendor_ruby:$(RUBYLIB) PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH)
+ GEM_HOME=/opt/puppetlabs/puppet/lib/ruby/gems/3.2.0 GEM_PATH=/opt/puppetlabs/puppet/lib/ruby/gems/3.2.0 RUBYLIB=/opt/puppetlabs/puppet/lib/ruby/vendor_ruby:$(RUBYLIB) PATH=/opt/pl-build-tools/bin:$(PATH) PKG_CONFIG_PATH=/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH)
@amitkarsale for next time, can you describe why you had to make this change in the commit summary? I assume you had to be pl-build-tools earlier in the PATH so that we used our gcc and not the system one? |
modified following files to consider sles11 platform addition and set environment path and dtrace arg
modified
configs/components/runtime-agent.rb
to switch between pl-gcc versions between 7.x & main. 7.x requires older version whereas main is compatible with latest 6.x version