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
packaging for puppet-foreman_scap_client [rpm] #1325
packaging for puppet-foreman_scap_client [rpm] #1325
Conversation
This is weird, when I try to download the module directly, I'm getting the following output with no redirection
the tarball has 12K, could we make an exception and maybe put this file into packaging repo? |
what's even more weird, following jenkins steps locally lead to working build in koji, I just had to modify tito.props |
btw Shlomi, you might want to add this to this PR diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index ba5bf1e..f76f2e5 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -362,6 +362,7 @@ whitelist = rubygem-algebrick
[foreman-plugins-nightly-nonscl-rhel7]
disttag = .el7
whitelist = rubygem-algebrick
+ puppet-foreman_scap_client
rubygem-apipie-params
rubygem-chef-api
rubygem-concurrent-ruby
@@ -397,6 +398,7 @@ whitelist = rubygem-algebrick
[foreman-plugins-nightly-fedora24]
disttag = .fc24
whitelist = rubygem-algebrick
+ puppet-foreman_scap_client
rubygem-angular-rails-templates
rubygem-apipie-params
rubygem-azure |
b22a426
to
96ecfcc
Compare
@ares - thanks, I have added the changes to |
could someone from @theforeman/packaging please take a look? would it be possible to avoid using annex for this package? or does anyone have some idea why it reports redirects? |
git-annex 3.x doesn't support HTTPS sources, only HTTP sources, but Puppet Forge is only accessible over HTTPS. We now have enough EL7 slaves that I can switch these tests over to run on EL7 with 5.x which should fix the problem. I'll re-test it when I've updated Jenkins. |
Source0: https://forgeapi.puppetlabs.com/v3/files/%{puppet_full_name}-%{version}.tar.gz | ||
BuildArch: noarch | ||
Requires: puppet >= 2.7.0 | ||
Requires: puppetlabs-stdlib >= 4.2.0 |
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.
What provides this?
[test] - packaging PR test slave updated to EL7, ought to fix git-annex HTTPS handling. |
96ecfcc
to
a8ab89a
Compare
@domcleal - I kinda got lost here... am I doing this right? |
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.
Please check it builds correctly with the provided mock configs, it seems to be failing tests.
Also needs adding to comps/plugins.
Source0: https://forgeapi.puppetlabs.com/v3/files/%{puppet_full_name}-%{version}.tar.gz | ||
BuildArch: noarch | ||
Requires: puppet >= 2.7.0 | ||
Requires: puppetlabs-stdlib >= 4.2.0 |
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.
What provides this?
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.
%{puppet_modules_dir}/%{puppet_module}/checksums.json | ||
%{puppet_modules_dir}/%{puppet_module}/Gemfile | ||
%{puppet_modules_dir}/%{puppet_module}/Rakefile | ||
%{puppet_modules_dir}/%{puppet_module}/lib/facter/rh_certificates.rb |
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.
Just list %{puppet_modules_dir}/%{puppet_module}/lib
so it includes everything below lib/
. Ditto with manifests, templates.
%{puppet_modules_dir}/%{puppet_module}/manifests/params.pp | ||
%{puppet_modules_dir}/%{puppet_module}/templates/config.yaml.erb | ||
%{puppet_modules_dir}/%{puppet_module}/templates/cron.erb | ||
%dir %{puppet_modules_dir}/%{puppet_module} |
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.
Move this between the %doc and files within this dir, it should be first.
@@ -362,6 +362,7 @@ whitelist = rubygem-algebrick | |||
[foreman-plugins-nightly-nonscl-rhel7] | |||
disttag = .el7 | |||
whitelist = rubygem-algebrick | |||
puppet-foreman_scap_client |
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.
Move this up a line, it's not alphabetical.
@@ -397,6 +398,7 @@ whitelist = rubygem-algebrick | |||
[foreman-plugins-nightly-fedora24] | |||
disttag = .fc24 | |||
whitelist = rubygem-algebrick | |||
puppet-foreman_scap_client |
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.
ditto
|
||
%files | ||
%doc NEWS COPYING README.md | ||
%{puppet_modules_dir}/%{puppet_module}/metadata.json |
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.
Consider defining %{puppet_module_dir} to make this less repetitive.
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.
How do I define this?
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.
Exactly the same way you already have: https://github.com/theforeman/foreman-packaging/pull/1325/files#diff-b80b253e976748958e41ab342c0c2d30R4
|
||
%install | ||
mkdir -p %{buildroot}/%{puppet_modules_dir}/%{puppet_module} | ||
cp -rp %{puppet_modules_dir}/%{puppet_module} %{buildroot}/%{puppet_modules_dir}/%{puppet_module}/ |
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.
This is failing, check the source exists (probably cp -rp . %{buildroot}/%{puppet_modules_dir}/%{puppet_module}
or similar), you need to be copying from the unpacked source, not the installation dir.
a8ab89a
to
42e3fa2
Compare
42e3fa2
to
79f509a
Compare
@domcleal, thanks for the help. |
I don't think removing the dependency is correct, it's specified as a dep within the metadata.json - so to use this package shouldn't require the user to install a package locally (else, why not just do it with this module too?). The package is available in Fedora, but not EPEL7. |
Got it. Will return it. How do I make the package available in EPEL7? |
I suggest filing a bug against the package first, else request the branch (https://fedoraproject.org/wiki/EPEL/FAQ#How_do_I_request_a_EPEL_branch_for_an_existing_Fedora_package.3F). |
79f509a
to
22f1eca
Compare
@domcleal - thanks, filed a bug and requested for EPEL7 branch. |
meanwhile we could package stdlib too I guess, it does not have any other deps |
@domcleal - EPEL7 has been approved: |
Yes, only the branch though - the build hasn't even moved into epel-testing yet: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2016-0c2c4e4800 |
22f1eca
to
c2ed288
Compare
@@ -364,7 +364,8 @@ scl = tfm | |||
|
|||
[foreman-nightly-fedora24] | |||
disttag = .fc24 | |||
whitelist = foreman | |||
whitelist = puppet-foreman_scap_client |
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.
Please remove it from here, it should only be in the plugin sections.
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.
Added by mistake. Removed.
c2ed288
to
29c64d0
Compare
Merged and will build, thanks @shlomizadok. |
For plugin updates, please indicate which repos this should be built into:
See Foreman's plugin maintainer documentation for more information.