-
Notifications
You must be signed in to change notification settings - Fork 25
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
Added SUPREMM Modules files to build.json #51
Conversation
Does this pull request have a dependency on a different pull request that you have not yet created? or perhaps a change to xdmod that has not been merged yet? |
xdmod-supremm.spec.in
Outdated
@@ -48,6 +48,7 @@ rm -rf $RPM_BUILD_ROOT | |||
%config(noreplace) %{_sysconfdir}/xdmod/rawstatisticsconfig.json | |||
%config(noreplace) %{_sysconfdir}/xdmod/supremmconfig.json | |||
%config(noreplace) %{_sysconfdir}/xdmod/aggregation_meta/modw_aggregates.supremmfact_aggregation_meta.json | |||
%config(noreplace) %{_sysconfdir}/modules.d/supremm.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.
Is this really a config noreplace file? I thought that the supremm.json contained the version number (and hence should be replaced on every install).
xdmod-supremm.spec.in
Outdated
@@ -41,14 +41,14 @@ rm -rf $RPM_BUILD_ROOT | |||
%{_libdir}/xdmod/ | |||
%{_datadir}/xdmod/ | |||
%{_docdir}/%{name}-%{version}__PRERELEASE__/ | |||
%{_sysconfdir}/modules.d/supremm.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.
Surely this should be
%{_sysconfdir}/xdmod/modules.d/supremm.json
|
||
%config(noreplace) %{_datadir}/xdmod/etl/js/config/supremm/etl.profile.js | ||
%config(noreplace) %{_sysconfdir}/xdmod/*.d/supremm.ini | ||
%config(noreplace) %{_sysconfdir}/xdmod/*.d/supremm*.json | ||
%config(noreplace) %{_sysconfdir}/xdmod/datawarehouse.d/supremm*.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.
Why supremm*.json rather than supremm.json? Do we anticipate having multiple files with supremm*.json? I thought the plan was for one file per 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.
My train of thought on this went something like: While we don't currently have any modules that specify more than one datawarehouse.d/ json file we do need to support roles.d/supremm.json and roles.d/supremm-jobviewer.json. I figured keeping the behavior the same across directories would be desirable, hence specifying supremm*.json for each of the sub-directories.
- Added modules.d/supremm.json to the file_maps section of build.json
- Updated the definition of modules.d/supremm.json so that the file is pulled from the correct location. - Explicitly defined the other *supremm*.json locations for config(noreplace) flagging as opposed to the more general /xdmod/*.d/supremm*.json ( which included modules.d/supremm.json, not what we wanted ). - Testing consisted of building the rpm with the latest docker image and then executing the following commands: - cd ~/rpmbuild/RPMS/noarch - rpm -qp --queryformat '[%{FILENAMES} %{FILEFLAGS} \n]' xdmod-supremm-7.0.0-1.0.el7.centos.noarch.rpm | grep -E "supremm.*\.json" | grep /etc/xdmod - ex. output: /etc/xdmod/datawarehouse.d/supremm.json 17 - if the number is 17 then it's a config / noreplace - if the number is 0 then it's just a regular file. - you can find all the file flags and their values ( it's a bitflag ) @ http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/pkgformat.html
Description
Added the modules.d/supremm.json file to build.json so that it is included in the packaged module.
Motivation and Context
Needed to pipe through the new modules.d/<module>.json file through to the package / final installed source.
Tests performed
Manually tested:
Types of changes
Checklist: