From f48e360c4b876f94d7cfbf93107502376e3f3d2d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 10 Jan 2022 16:49:48 +0000 Subject: [PATCH 01/31] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..75796d1 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ansible-packaging + +The ansible-packaging package From 6ae39f7436c9d68f006b96ff6b5b04ac9e020bfb Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 13 Jan 2022 20:18:24 -0500 Subject: [PATCH 02/31] Initial packaging split out of ansible-core (#2038591) --- .gitignore | 0 COPYING | 674 +++++++++++++++++++++++++++++++++++++++++ ansible-generator | 57 ++++ ansible-packaging.spec | 49 +++ ansible.attr | 3 + macros.ansible | 7 + sources | 0 7 files changed, 790 insertions(+) create mode 100644 .gitignore create mode 100644 COPYING create mode 100755 ansible-generator create mode 100644 ansible-packaging.spec create mode 100644 ansible.attr create mode 100644 macros.ansible create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ansible-generator b/ansible-generator new file mode 100755 index 0000000..71bff9f --- /dev/null +++ b/ansible-generator @@ -0,0 +1,57 @@ +#!/usr/bin/python3 + +# Copyright (C) 2020 Igor Raits . +# +# Fedora-License-Identifier: GPLv3+ +# SPDX-2.0-License-Identifier: GPL-3.0+ +# SPDX-3.0-License-Identifier: GPL-3.0-or-later +# +# This program is free software. +# For more information on the license, see COPYING. +# For more information on free software, see +# . + +import argparse +import json +import re +import sys + + +def main(): + parser = argparse.ArgumentParser() + group = parser.add_mutually_exclusive_group(required=True) + group.add_argument( + "-P", "--provides", action="store_const", const="provides", dest="action" + ) + group.add_argument( + "-R", "--requires", action="store_const", const="requires", dest="action" + ) + args = parser.parse_args() + + files = sys.stdin.read().splitlines() + + for f in files: + with open(f, "r") as fobj: + info = json.load(fobj)["collection_info"] + if args.action == "provides": + print( + f"ansible-collection({info['namespace']}.{info['name']}) = {info['version']}" + ) + if args.action == "requires": + print("(ansible >= 2.9.0 or ansible-core >= 2.11.0)") + for dep, req in info.get("dependencies", {}).items(): + print(f"ansible-collection({dep})", end="") + if req == "*": + print() + continue + m = re.match(r"^>=(\d+\.\d+\.\d+)$", req) + if m: + print(f" >= {m.group(1)}") + continue + raise NotImplementedError( + "Generation of dependencies different than '*' or '>=' is not supported yet" + ) + + +if __name__ == "__main__": + main() diff --git a/ansible-packaging.spec b/ansible-packaging.spec new file mode 100644 index 0000000..77b2966 --- /dev/null +++ b/ansible-packaging.spec @@ -0,0 +1,49 @@ +Name: ansible-packaging +Version: 1 +Release: 1%{?dist} +Summary: RPM packaging macros and generators for Ansible collections + +License: GPLv3+ + +Source0: ansible-generator +Source1: ansible.attr +Source2: macros.ansible +Source3: COPYING + +Requires: ansible-core + +# Conflict with anything providing its own copies of these files +Conflicts: ansible-core < 2.12.1-3 +Conflicts: ansible <= 2.9.99 + +BuildArch: noarch + +%description +%{summary}. + + +%prep +%autosetup -T -c +cp -a %{sources} . + + +%build +# Nothing to build + + +%install +install -Dpm0644 -t %{buildroot}%{_fileattrsdir} ansible.attr +install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible +install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator + + +%files +%license COPYING +%{_fileattrsdir}/ansible.attr +%{_rpmmacrodir}/macros.ansible +%{_rpmconfigdir}/ansible-generator + + +%changelog +* Thu Jan 13 2022 Neal Gompa - 1-1 +- Initial packaging split out of ansible-core (#2038591) diff --git a/ansible.attr b/ansible.attr new file mode 100644 index 0000000..997dafa --- /dev/null +++ b/ansible.attr @@ -0,0 +1,3 @@ +%__ansible_provides %{_rpmconfigdir}/ansible-generator --provides +%__ansible_requires %{_rpmconfigdir}/ansible-generator --requires +%__ansible_path ^%{_datadir}/ansible/collections/ansible_collections/[^/]+/[^/]+/MANIFEST.json$ diff --git a/macros.ansible b/macros.ansible new file mode 100644 index 0000000..c8c91fb --- /dev/null +++ b/macros.ansible @@ -0,0 +1,7 @@ +%ansible_collection_url() https://galaxy.ansible.com/%{collection_namespace}/%{collection_name} + +%ansible_collection_build() ansible-galaxy collection build + +%ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz + +%ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/ diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 76cc4a6e18abf1f1aaaf5a924a0ebf6d37f326bd Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 13 Jan 2022 20:22:49 -0500 Subject: [PATCH 03/31] Only set conflicts on anything not RHEL 9+ --- ansible-packaging.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 77b2966..efe1a75 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -13,7 +13,9 @@ Source3: COPYING Requires: ansible-core # Conflict with anything providing its own copies of these files +%if ! (0%{?rhel} >= 9) Conflicts: ansible-core < 2.12.1-3 +%endif Conflicts: ansible <= 2.9.99 BuildArch: noarch From 04cd2f83ed8693f5b898455e17b96cd9e64f1e73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:19:58 +0000 Subject: [PATCH 04/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ansible-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index efe1a75..efa7410 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPLv3+ @@ -47,5 +47,8 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jan 13 2022 Neal Gompa - 1-1 - Initial packaging split out of ansible-core (#2038591) From d349c3c366281922a54376758234d10b977a599b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 31 Jan 2022 20:40:17 -0500 Subject: [PATCH 05/31] Drop legacy ansible package support and make compatibile with RHEL 8.6+ --- ansible-generator | 2 +- ansible-packaging.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible-generator b/ansible-generator index 71bff9f..862947e 100755 --- a/ansible-generator +++ b/ansible-generator @@ -38,7 +38,7 @@ def main(): f"ansible-collection({info['namespace']}.{info['name']}) = {info['version']}" ) if args.action == "requires": - print("(ansible >= 2.9.0 or ansible-core >= 2.11.0)") + print("ansible-core >= 2.12.0") for dep, req in info.get("dependencies", {}).items(): print(f"ansible-collection({dep})", end="") if req == "*": diff --git a/ansible-packaging.spec b/ansible-packaging.spec index efa7410..4aec199 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPLv3+ @@ -13,7 +13,7 @@ Source3: COPYING Requires: ansible-core # Conflict with anything providing its own copies of these files -%if ! (0%{?rhel} >= 9) +%if ! (0%{?rhel} >= 8) Conflicts: ansible-core < 2.12.1-3 %endif Conflicts: ansible <= 2.9.99 @@ -47,6 +47,10 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator %changelog +* Mon Jan 31 2022 Neal Gompa - 1-3 +- Drop vestigial support for the legacy ansible package +- Make compatibile with RHEL 8.6+ + * Wed Jan 19 2022 Fedora Release Engineering - 1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 854a0868b7214a8872f9135a7fc61ab9119143bb Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 26 Apr 2022 21:13:39 -0500 Subject: [PATCH 06/31] Restore compatability with f34 and f35. --- ansible-generator | 2 +- ansible-packaging.spec | 11 ++++++++--- ansible.attr | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ansible-generator b/ansible-generator index 862947e..3d485e7 100755 --- a/ansible-generator +++ b/ansible-generator @@ -38,7 +38,7 @@ def main(): f"ansible-collection({info['namespace']}.{info['name']}) = {info['version']}" ) if args.action == "requires": - print("ansible-core >= 2.12.0") + print("(ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10))") for dep, req in info.get("dependencies", {}).items(): print(f"ansible-collection({dep})", end="") if req == "*": diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 4aec199..5833189 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPLv3+ @@ -10,13 +10,15 @@ Source1: ansible.attr Source2: macros.ansible Source3: COPYING -Requires: ansible-core +# Require either ansible-core or a version of ansible 2.9 that supports collections but prefer ansible-core. +Requires: (ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10)) +Suggests: ansible-core # Conflict with anything providing its own copies of these files %if ! (0%{?rhel} >= 8) Conflicts: ansible-core < 2.12.1-3 %endif -Conflicts: ansible <= 2.9.99 +Conflicts: ansible < 2.9.27-3 BuildArch: noarch @@ -47,6 +49,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator %changelog +* Tue Apr 26 2022 Maxwell G - 1-4 +- Restore compatability with f34 and f35. + * Mon Jan 31 2022 Neal Gompa - 1-3 - Drop vestigial support for the legacy ansible package - Make compatibile with RHEL 8.6+ diff --git a/ansible.attr b/ansible.attr index 997dafa..7c0c346 100644 --- a/ansible.attr +++ b/ansible.attr @@ -1,3 +1,4 @@ %__ansible_provides %{_rpmconfigdir}/ansible-generator --provides %__ansible_requires %{_rpmconfigdir}/ansible-generator --requires +%__ansible_suggests /usr/bin/echo ansible-core %__ansible_path ^%{_datadir}/ansible/collections/ansible_collections/[^/]+/[^/]+/MANIFEST.json$ From 1fc7f6293b4a3a9e40bccfc2390c4dd5cbe4131a Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 17 May 2022 10:25:39 -0500 Subject: [PATCH 07/31] Split macros required for building SRPMs into a separate package. --- ansible-packaging.spec | 22 ++++++++++++++++++++-- macros.ansible | 2 -- macros.ansible-srpm | 1 + 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 macros.ansible-srpm diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 5833189..4892a56 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPLv3+ @@ -8,12 +8,15 @@ License: GPLv3+ Source0: ansible-generator Source1: ansible.attr Source2: macros.ansible -Source3: COPYING +Source3: macros.ansible-srpm +Source4: COPYING # Require either ansible-core or a version of ansible 2.9 that supports collections but prefer ansible-core. Requires: (ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10)) Suggests: ansible-core +Requires: ansible-srpm-macros = %{version}-%{release} + # Conflict with anything providing its own copies of these files %if ! (0%{?rhel} >= 8) Conflicts: ansible-core < 2.12.1-3 @@ -26,6 +29,13 @@ BuildArch: noarch %{summary}. +%package -n ansible-srpm-macros +Summary: SRPM stage RPM packaging macros for Ansible collections + +%description -n ansible-srpm-macros +%{summary}. + + %prep %autosetup -T -c cp -a %{sources} . @@ -38,6 +48,7 @@ cp -a %{sources} . %install install -Dpm0644 -t %{buildroot}%{_fileattrsdir} ansible.attr install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible +install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible-srpm install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator @@ -48,7 +59,14 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator %{_rpmconfigdir}/ansible-generator +%files -n ansible-srpm-macros +%{_rpmmacrodir}/macros.ansible-srpm + + %changelog +* Tue May 17 2022 Maxwell G - 1-5 +- Split macros required for building SRPMs into a separate package. + * Tue Apr 26 2022 Maxwell G - 1-4 - Restore compatability with f34 and f35. diff --git a/macros.ansible b/macros.ansible index c8c91fb..7165f8e 100644 --- a/macros.ansible +++ b/macros.ansible @@ -1,5 +1,3 @@ -%ansible_collection_url() https://galaxy.ansible.com/%{collection_namespace}/%{collection_name} - %ansible_collection_build() ansible-galaxy collection build %ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz diff --git a/macros.ansible-srpm b/macros.ansible-srpm new file mode 100644 index 0000000..9b208b4 --- /dev/null +++ b/macros.ansible-srpm @@ -0,0 +1 @@ +%ansible_collection_url() https://galaxy.ansible.com/%{collection_namespace}/%{collection_name} From aee1b8704c52cb64179da0940eb9830c8549d2b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:53:40 +0000 Subject: [PATCH 08/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ansible-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 4892a56..ff77800 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPLv3+ @@ -64,6 +64,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue May 17 2022 Maxwell G - 1-5 - Split macros required for building SRPMs into a separate package. From 4397502948d0cf29ec2e8c1f1e8fb68a273d7dda Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 18 Jul 2022 23:34:08 -0500 Subject: [PATCH 09/31] Add initial ansible_test_unit macro --- macros.ansible | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/macros.ansible b/macros.ansible index 7165f8e..39a84e7 100644 --- a/macros.ansible +++ b/macros.ansible @@ -2,4 +2,11 @@ %ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz +%ansible_test_unit %{expand:\\\ +mkdir -p ../ansible_collections/%{collection_namespace} +cp -a $(pwd) ../ansible_collections/%{collection_namespace}/%{collection_name} +pushd ../ansible_collections/%{collection_namespace}/%{collection_name} +ansible-test units --python-interpreter %{__python3} --local +popd} + %ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/ From 098f96c5bb91c94221b23b5965ae7b1af2a416bd Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 13 Aug 2022 12:47:00 -0500 Subject: [PATCH 10/31] Properly handle ansible_test_unit macro arguments --- macros.ansible | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros.ansible b/macros.ansible index 39a84e7..abab21d 100644 --- a/macros.ansible +++ b/macros.ansible @@ -2,11 +2,11 @@ %ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz -%ansible_test_unit %{expand:\\\ +%ansible_test_unit() %{expand:\\\ mkdir -p ../ansible_collections/%{collection_namespace} cp -a $(pwd) ../ansible_collections/%{collection_namespace}/%{collection_name} pushd ../ansible_collections/%{collection_namespace}/%{collection_name} -ansible-test units --python-interpreter %{__python3} --local +ansible-test units --python-interpreter %{__python3} --local %{?*} popd} %ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/ From a5b014cf2998723b2a3de55a806330d41008e4b6 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 13 Aug 2022 12:41:27 -0500 Subject: [PATCH 11/31] Only build against ansible-core We want the newest ansible-test, and we may add other macros that require the newest version. The generated runtime Requires remain the same. --- ansible-generator | 2 ++ ansible-packaging.spec | 6 +++--- ansible.attr | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible-generator b/ansible-generator index 3d485e7..81fd613 100755 --- a/ansible-generator +++ b/ansible-generator @@ -38,6 +38,8 @@ def main(): f"ansible-collection({info['namespace']}.{info['name']}) = {info['version']}" ) if args.action == "requires": + # Require either ansible-core or a version of ansible 2.9 that + # supports collections but prefer ansible-core. print("(ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10))") for dep, req in info.get("dependencies", {}).items(): print(f"ansible-collection({dep})", end="") diff --git a/ansible-packaging.spec b/ansible-packaging.spec index ff77800..da9d6c4 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -11,9 +11,9 @@ Source2: macros.ansible Source3: macros.ansible-srpm Source4: COPYING -# Require either ansible-core or a version of ansible 2.9 that supports collections but prefer ansible-core. -Requires: (ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10)) -Suggests: ansible-core +# Require ansible-core for building. Collections still have a boolean runtime +# dependency on either ansible 2.9 OR ansible-core. +Requires: ansible-core Requires: ansible-srpm-macros = %{version}-%{release} diff --git a/ansible.attr b/ansible.attr index 7c0c346..2a9fcab 100644 --- a/ansible.attr +++ b/ansible.attr @@ -1,4 +1,6 @@ %__ansible_provides %{_rpmconfigdir}/ansible-generator --provides %__ansible_requires %{_rpmconfigdir}/ansible-generator --requires +# Prefer ansible-core over ansible. This shells out to echo instead of using a +# parametric dependency generator to support EL 8. %__ansible_suggests /usr/bin/echo ansible-core %__ansible_path ^%{_datadir}/ansible/collections/ansible_collections/[^/]+/[^/]+/MANIFEST.json$ From 247eaefd984b29340f20042727e180145d245683 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 13 Aug 2022 12:44:44 -0500 Subject: [PATCH 12/31] Adopt new licensing guidelines --- ansible-packaging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index da9d6c4..2a9d6e3 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -3,7 +3,7 @@ Version: 1 Release: 6%{?dist} Summary: RPM packaging macros and generators for Ansible collections -License: GPLv3+ +License: GPL-3.0-or-later Source0: ansible-generator Source1: ansible.attr From 1fe80d26d6c04c61b5634304c60f34c3bbbee303 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 13 Aug 2022 12:43:19 -0500 Subject: [PATCH 13/31] Add tests meta subpackage --- ansible-packaging.spec | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 2a9d6e3..50e256d 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPL-3.0-or-later @@ -30,11 +30,31 @@ BuildArch: noarch %package -n ansible-srpm-macros -Summary: SRPM stage RPM packaging macros for Ansible collections +Summary: SRPM stage RPM packaging macros for Ansible collections %description -n ansible-srpm-macros %{summary}. +%package tests +Summary: Dependencies for Ansible collection package unit tests +Requires: %{name} = %{version}-%{release} +Requires: /usr/bin/ansible-test +# This list is taken from %%{python3_sitelib}/ansible_test/_data/requirements/units.txt +Requires: %{py3_dist pytest} +Requires: %{py3_dist pytest-mock} +Requires: %{py3_dist pytest-xdist} +Requires: %{py3_dist pytest-forked} +Requires: %{py3_dist pyyaml} +# mock is included in the list upstream, but is deprecated in Fedora. +# Maintainers should work with upstream to add compat code to support +# both unittest.mock and mock and/or patch it out themselves. +# See https://fedoraproject.org/wiki/Changes/DeprecatePythonMock. +# Requires: %%{py3_dist mock} + +%description tests +This package contains the necessary dependencies to run unit tests for packaged +Ansible collections + %prep %autosetup -T -c @@ -62,8 +82,19 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator %files -n ansible-srpm-macros %{_rpmmacrodir}/macros.ansible-srpm +# ansible-core in RHEL 8.6 is built against python38. In c8s and the next RHEL +# 8 minor release, it will be built against python39. The testing dependencies +# are not yet packaged for either python version in EPEL 8. +%if ! (%{defined rhel} && 0%{?rhel} < 9) +%files tests +%endif + %changelog +* Mon Aug 01 2022 Maxwell G - 1-7 +- Implement %%ansible_test_unit and add ansible-packaging-tests metapackage. +- Require ansible-core at buildtime + * Wed Jul 20 2022 Fedora Release Engineering - 1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2f4f3dbe16c97231a99c1f0b7305846609058c93 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Sep 2022 18:00:58 -0500 Subject: [PATCH 14/31] Add %ansible_roles_dir and %ansible_collections_dir We expect collections to use %ansible_collection_install and %ansible_collection_file{s,list}. I'm mainly defining %ansible_collection_dir for use in our macros. There are a couple packaged roles in Fedora that can use %ansible_roles_dir. This can also be used if we decide to implement macros for packaging roles. --- macros.ansible | 3 +++ 1 file changed, 3 insertions(+) diff --git a/macros.ansible b/macros.ansible index abab21d..5e2bc06 100644 --- a/macros.ansible +++ b/macros.ansible @@ -1,3 +1,6 @@ +%ansible_roles_dir %{_datadir}/ansible/roles +%ansible_collections_dir %{_datadir}/ansible/collections/ansible_collections + %ansible_collection_build() ansible-galaxy collection build %ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz From bc337bd8e48760c9670613391c7f0145542cded5 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Sep 2022 18:21:05 -0500 Subject: [PATCH 15/31] Add ansible_collection.py helper script The %collection_namespace and %collection_name macros are clunky. This script preforms two tasks: - install: extract the namespace, name, and version from galaxy.yml, run `ansible-galaxy install`, and write a filelist for use with %files -f. - test: create a temporary build directory with the required directory structure for ansible-test to work and run `ansible-test units`. --- ansible-packaging.spec | 13 +++- ansible_collection.py | 138 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 3 deletions(-) create mode 100755 ansible_collection.py diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 50e256d..4e2478c 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -9,7 +9,12 @@ Source0: ansible-generator Source1: ansible.attr Source2: macros.ansible Source3: macros.ansible-srpm -Source4: COPYING +Source4: ansible_collection.py + +Source100: COPYING + +# Needed for ansible_collection.py +Requires: %{py3_dist pyyaml} # Require ansible-core for building. Collections still have a boolean runtime # dependency on either ansible 2.9 OR ansible-core. @@ -67,9 +72,10 @@ cp -a %{sources} . %install install -Dpm0644 -t %{buildroot}%{_fileattrsdir} ansible.attr -install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible -install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible-srpm +install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible +install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible-srpm install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator +install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible_collection.py %files @@ -77,6 +83,7 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator %{_fileattrsdir}/ansible.attr %{_rpmmacrodir}/macros.ansible %{_rpmconfigdir}/ansible-generator +%{_rpmconfigdir}/ansible_collection.py %files -n ansible-srpm-macros diff --git a/ansible_collection.py b/ansible_collection.py new file mode 100755 index 0000000..18f04a9 --- /dev/null +++ b/ansible_collection.py @@ -0,0 +1,138 @@ +#!/usr/bin/python3 +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText 2022 Maxwell G + +""" +This script uses Ansible Collection metadata from galaxy.yml to figure out the +namespace, name, and version of the collection being packaged. + +``ansible_collection.py install`` (used by %ansible_collecton_install) uses +this information to find and install the collection artifact that was just +built with %ansible_collection_build. It also generates a files list for use +with `%files -f`. + +``ansible_collection.py test`` (used by %ansible_test_unit) parses galaxy.yml +to determine the collection namespace and name that's needed to create the +directory structure that ansible-test expects. After creating a temporary build +directory with the needed structure, the script runs ansible-test units with +the provided arguments. +""" + +import argparse +import shutil +import subprocess +import sys +from pathlib import Path +from tempfile import TemporaryDirectory +from typing import Any, Dict, Optional, Sequence, Union + +from yaml import CSafeLoader, load + + +class CollectionError(Exception): + pass + + +class AnsibleCollection: + def __init__(self, collection_srcdir: Optional[Path] = None) -> None: + self.collection_srcdir = collection_srcdir or Path.cwd() + self.data = self._load_data() + self.namespace = self.data["namespace"] + self.name = self.data["name"] + self.version = self.data["version"] + + def _load_data(self) -> Dict[str, Any]: + path = self.collection_srcdir / "galaxy.yml" + if not path.exists(): + raise CollectionError(f"{path} does not exist!") + print(f"Loading collection metadata from {path}") + + with open(path, encoding="utf-8") as file: + return load(file, Loader=CSafeLoader) + + def install(self, destdir: Union[str, Path]) -> None: + args = ( + "ansible-galaxy", + "collection", + "install", + "-n", + "-p", + str(destdir), + f"{self.namespace}-{self.name}-{self.version}.tar.gz", + ) + print(f"Running: {args}") + print() + subprocess.run(args, check=True, cwd=self.collection_srcdir) + + def write_filelist(self, filelist: Path) -> None: + filelist.parent.mkdir(parents=True, exist_ok=True) + contents = "%{ansible_collections_dir}/" + self.namespace + print(f"Writing filelist to {filelist}") + with open(filelist, "w", encoding="utf-8") as file: + file.write(contents) + + def unit_test(self, extra_args: Sequence) -> None: + with TemporaryDirectory() as temp: + temppath = Path(temp) / "ansible_collections" / self.namespace / self.name + shutil.copytree( + self.collection_srcdir, + temppath, + ) + args = ("ansible-test", "units", *extra_args) + print(f"Running: {args}") + print() + subprocess.run(args, cwd=temppath, check=True) + + +def parseargs() -> argparse.Namespace: + parser = argparse.ArgumentParser( + "Install and test Ansible Collections in an rpmbuild environment" + ) + subparsers = parser.add_subparsers(dest="action") + install_parser = subparsers.add_parser( + "install", + help="Run ansible-galaxy collection install and write filelist", + ) + install_parser.add_argument( + "--collections-dir", + required=True, + help="Collection destination directory", + type=Path, + ) + install_parser.add_argument( + "--filelist", + type=Path, + required=True, + help="%%{ansible_collection_filelist}", + ) + + test_parser = subparsers.add_parser( + "test", + help="Run ansible-test unit after creating the necessary directory structure", + ) + test_parser.add_argument( + "extra_args", nargs="*", help="Extra arguments to pass to ansible-test" + ) + args = parser.parse_args() + # add_subparsers does not support required on Python 3.6 + if not args.action: + parser.print_usage() + sys.exit(2) + return args + + +def main(): + args = parseargs() + collection = AnsibleCollection() + if args.action == "install": + collection.install(args.collections_dir) + collection.write_filelist(args.filelist) + elif args.action == "test": + collection.unit_test(args.extra_args) + + +if __name__ == "__main__": + try: + main() + except CollectionError as err: + sys.exit(err) From deee147c9518bb49974d96436ca11ce60345be17 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Sep 2022 18:39:23 -0500 Subject: [PATCH 16/31] Refactor %ansible_collection_install This change removes %ansible_collection_install's dependence on the %collection_namespace and %collection_name macros. Now, the macro uses the new helper script which extracts this information from galaxy.yml. Parsing the galaxy.yml instead of using %{version} to determine the collection version also lends another benefit: it allows us to package pre-releases. Previously, discrepancies between %{version} and the upstream version (eg. "3.0.0~rc1" vs "3.0.0-rc1") broke the macro. --- macros.ansible | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/macros.ansible b/macros.ansible index 5e2bc06..856688e 100644 --- a/macros.ansible +++ b/macros.ansible @@ -1,9 +1,18 @@ +# Stores ephemeral data that's created by %%ansible_collection_install +# and used by other macros. +%__ansible_builddir %{_builddir}/%{?buildsubdir:%{buildsubdir}/}.ansible-packaging + %ansible_roles_dir %{_datadir}/ansible/roles %ansible_collections_dir %{_datadir}/ansible/collections/ansible_collections %ansible_collection_build() ansible-galaxy collection build -%ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz +%ansible_collection_install() %{shrink: +%{_rpmconfigdir}/ansible_collection.py install +--collections-dir %{buildroot}%{ansible_collections_dir} +--filelist %{ansible_collection_filelist} +} + %ansible_test_unit() %{expand:\\\ mkdir -p ../ansible_collections/%{collection_namespace} From 78dcf4c992c5c3189675c7f579864c9140cf5898 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Sep 2022 18:50:36 -0500 Subject: [PATCH 17/31] Outsource %ansible_test_unit logic to helper script We want %ansible_test_unit to retrieve the collection name{,space} from galaxy.yml. This removes the need for the %collection_name{,space} macros and utilizes ansible_collection.py's more robust approach to running the tests. --- macros.ansible | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/macros.ansible b/macros.ansible index 856688e..0c81432 100644 --- a/macros.ansible +++ b/macros.ansible @@ -13,12 +13,10 @@ --filelist %{ansible_collection_filelist} } +%ansible_test_unit() %{shrink: +%{_rpmconfigdir}/ansible_collection.py test -- +--python-interpreter %{__python3} --local %{?*} +} -%ansible_test_unit() %{expand:\\\ -mkdir -p ../ansible_collections/%{collection_namespace} -cp -a $(pwd) ../ansible_collections/%{collection_namespace}/%{collection_name} -pushd ../ansible_collections/%{collection_namespace}/%{collection_name} -ansible-test units --python-interpreter %{__python3} --local %{?*} -popd} %ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/ From b1de39d9c64cabf7c40c29d445e135b0e41a3f0b Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Sep 2022 19:02:02 -0500 Subject: [PATCH 18/31] Add new %ansible_collection_filelist macro %ansible_collection_files cannot be adapted to dynamically determine the collection namespace. We need to use a file list for that. %ansible_collection_install writes out a file list to %ansible_collection_filelist. Packagers would pass `%{ansible_collection_filelist}` to `%files -f`. Eventually, I'd like to deprecate %ansible_collection_files. That won't happen until the new approach has gotten more testing and adoption. --- macros.ansible | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/macros.ansible b/macros.ansible index 0c81432..57c89fe 100644 --- a/macros.ansible +++ b/macros.ansible @@ -18,5 +18,11 @@ --python-interpreter %{__python3} --local %{?*} } +# TODO: Officially deprecate this macro and add the following line to the macro +# def after the new approach has gotten more testing and adoption: +# %%{warn: %%{ansible_collection_files} is deprecated. Use %%files -f %%{ansible_collection_filelist} instead.} +%ansible_collection_files %{shrink: +%{ansible_collections_dir}/%{collection_namespace}/ +} -%ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/ +%ansible_collection_filelist %{__ansible_builddir}/ansible_collection_files From 5e5c534c320247ac15c4825d251e9130f9408291 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Sep 2022 23:08:22 -0500 Subject: [PATCH 19/31] Check if artifact exists before trying to install it --- ansible_collection.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ansible_collection.py b/ansible_collection.py index 18f04a9..17c6777 100755 --- a/ansible_collection.py +++ b/ansible_collection.py @@ -51,6 +51,14 @@ class AnsibleCollection: return load(file, Loader=CSafeLoader) def install(self, destdir: Union[str, Path]) -> None: + artifact = self.collection_srcdir / Path( + f"{self.namespace}-{self.name}-{self.version}.tar.gz" + ) + if not artifact.exists() and not artifact.is_file(): + raise CollectionError( + f"{artifact} does not exist! Did you run %ansible_collection_build?" + ) + args = ( "ansible-galaxy", "collection", @@ -58,11 +66,12 @@ class AnsibleCollection: "-n", "-p", str(destdir), - f"{self.namespace}-{self.name}-{self.version}.tar.gz", + str(artifact), ) print(f"Running: {args}") print() subprocess.run(args, check=True, cwd=self.collection_srcdir) + print() def write_filelist(self, filelist: Path) -> None: filelist.parent.mkdir(parents=True, exist_ok=True) @@ -134,5 +143,5 @@ def main(): if __name__ == "__main__": try: main() - except CollectionError as err: + except (CollectionError, subprocess.CalledProcessError) as err: sys.exit(err) From e3d150ec904179fd2d529763491692ee3b192c44 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 24 Sep 2022 02:21:57 -0500 Subject: [PATCH 20/31] Flush stdout before subprocess.run This commit adds sys.stdout.flush() before subprocess.run() in ansible_collection.py. Without this, the print statements are shown after the command output when building in mock. --- ansible_collection.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible_collection.py b/ansible_collection.py index 17c6777..70093be 100755 --- a/ansible_collection.py +++ b/ansible_collection.py @@ -70,6 +70,9 @@ class AnsibleCollection: ) print(f"Running: {args}") print() + # Without this, the print statements are shown after the command + # output when building in mock. + sys.stdout.flush() subprocess.run(args, check=True, cwd=self.collection_srcdir) print() @@ -90,6 +93,9 @@ class AnsibleCollection: args = ("ansible-test", "units", *extra_args) print(f"Running: {args}") print() + # Without this, the print statements are shown after the command + # output when building in mock. + sys.stdout.flush() subprocess.run(args, cwd=temppath, check=True) From c67bd58e7937afa0cff3e9ce94e4d5d3a3a14a3d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 24 Sep 2022 16:37:59 -0500 Subject: [PATCH 21/31] %ansible_collection_url: Don't require control macros Reimplement %ansible_collection_url to accept the collection namespace and name as arguments instead of requiring oblique control macros. This also adds some basic tests to ensure that the macro behaves properly. --- ansible-packaging.spec | 51 ++++++++++++++++++++++++++++++++++++++++++ macros.ansible-srpm | 26 ++++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 4e2478c..26b648f 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -77,6 +77,57 @@ install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible-srpm install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible_collection.py +%check +# TODO: Currently, this only tests %%{ansible_collection_url}. + +rpm_eval() { + default_macros_path="$(rpm --showrc | grep 'Macro path' | awk -F ': ' '{print $2}')" + rpm --macros="${default_macros_path}:%{buildroot}%{_rpmmacrodir}/macros.*" "$@" +} + +errors() { + error="error: %%ansible_collection_url: You must pass the collection namespace as the first arg and the collection name as the second" + "$@" && exit 1 + "$@" |& grep -q "${error}" +} + +echo "Ensure macro fails when only collection_namespace macro is defined" +errors rpm_eval -D 'collection_namespace cc' -E '%%ansible_collection_url' + +echo +echo "Ensure macro fails when only collection_name macro is defined" +errors rpm_eval -D 'collection_name cc' -E '%%ansible_collection_url' + +echo +echo "Ensure macro fails when second argument is missing" +errors rpm_eval -E '%%ansible_collection_url a' + +echo +echo "Ensure macro fails when second argument is missing" +errors rpm_eval -D 'collection_name b' -E '%%ansible_collection_url a' + +echo +echo "Ensure macro fails when neither the control macros nor macro arguments are passed" +errors rpm_eval -E '%%ansible_collection_url' + + +echo +echo +echo "Ensure macro works when both arguments are passed and no control macros are set" +[[ $(rpm_eval -E '%%ansible_collection_url community general') == \ + "https://galaxy.ansible.com/community/general" ]] + +echo +echo "Ensure macro works with the control macros" +[[ $(rpm_eval -D 'collection_namespace ansible' -D 'collection_name posix' \ + -E '%%ansible_collection_url') == "https://galaxy.ansible.com/ansible/posix" ]] + +echo +echo "Ensure macro prefers the collection namespace and name passed as an argument over the control macros" +[[ $(rpm_eval -D 'collection_namespace ansible' -D 'collection_name posix' \ + -E '%%ansible_collection_url community general') == "https://galaxy.ansible.com/community/general" ]] + + %files %license COPYING diff --git a/macros.ansible-srpm b/macros.ansible-srpm index 9b208b4..0adacd7 100644 --- a/macros.ansible-srpm +++ b/macros.ansible-srpm @@ -1 +1,25 @@ -%ansible_collection_url() https://galaxy.ansible.com/%{collection_namespace}/%{collection_name} +# Note(gotmax23): I'm trying to get rid of the need for control macros in favor +# of a metadata based approach. %%ansible_collection_url is the only macro that +# requires manually specifying the collection namespace and name, as it is used +# at the SRPM build stage. +# +# Currently, this macro supports either passing this information as arguments +# or defining the control macros. In order to reduce confusion, this is not an +# either or approach. Both arguments must be passed OR both control macros must +# be defined. + +%ansible_collection_url() %{lua: + local namespace_name = nil + if rpm.expand("%collection_namespace") ~= "%collection_namespace" + and rpm.expand("%collection_name") ~= "%collection_name" then + namespace_name = rpm.expand("%collection_namespace") .. "/" .. rpm.expand("%collection_name") + end + if rpm.expand("%1") ~= "%1" and rpm.expand("%2") ~= "%2" then + namespace_name = rpm.expand("%1") .. "/" .. rpm.expand("%2") + end + if not namespace_name then + rpm.expand("%{error:%%ansible_collection_url: You must pass the collection " .. + "namespace as the first arg and the collection name as the second}") + end + print("https://galaxy.ansible.com/" .. namespace_name) +} From fc8efd22baac9128ba46ce0ce164c8fbc15cf5f3 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 25 Sep 2022 21:18:54 -0500 Subject: [PATCH 22/31] Undefine %%_package_note_file to stop that file from leaking into collection artifacts --- macros.ansible | 3 +++ 1 file changed, 3 insertions(+) diff --git a/macros.ansible b/macros.ansible index 57c89fe..db2269a 100644 --- a/macros.ansible +++ b/macros.ansible @@ -7,7 +7,10 @@ %ansible_collection_build() ansible-galaxy collection build +# On F36, package-notes-srpm-macros inserts a package note file into +# %%{buildsubdir} that ends up getting included in the collection builds. %ansible_collection_install() %{shrink: +%undefine _package_note_file %{_rpmconfigdir}/ansible_collection.py install --collections-dir %{buildroot}%{ansible_collections_dir} --filelist %{ansible_collection_filelist} From 7ea0e618c901051d80d2bddb8e87ade5631b4980 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 25 Sep 2022 21:21:19 -0500 Subject: [PATCH 23/31] Update changelog --- ansible-packaging.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 26b648f..dd929fb 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 7%{?dist} +Release: 8.1%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPL-3.0-or-later @@ -149,6 +149,17 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume %changelog +* Sat Sep 24 2022 Maxwell G - 1-8.1 +- Refactor %%ansible_collection_url, %%ansible_collection_install, + %%ansible_test_unit. +- Specfiles no longer need to define %%collection_namespace or %%collection_name + for the macros to work. +- Add new %%ansible_collections_dir, %%ansible_roles_dir, and + %ansible_collection_filelist macros. +- Prepare to deprecate %%ansible_collection_files +- Undefine %%_package_note_file to stop that file from leaking into collection + artifacts. + * Mon Aug 01 2022 Maxwell G - 1-7 - Implement %%ansible_test_unit and add ansible-packaging-tests metapackage. - Require ansible-core at buildtime From f85cd2c4b6a4181991f08dc6930876634409613b Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 30 Sep 2022 15:40:24 -0500 Subject: [PATCH 24/31] Escape macro in changelog --- ansible-packaging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index dd929fb..2bfb057 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -155,7 +155,7 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume - Specfiles no longer need to define %%collection_namespace or %%collection_name for the macros to work. - Add new %%ansible_collections_dir, %%ansible_roles_dir, and - %ansible_collection_filelist macros. + %%ansible_collection_filelist macros. - Prepare to deprecate %%ansible_collection_files - Undefine %%_package_note_file to stop that file from leaking into collection artifacts. From a7e7605670b3abcc27752fa3e7d97ef7ae59c88a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:49:07 +0000 Subject: [PATCH 25/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ansible-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 2bfb057..3b8cd3f 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 8.1%{?dist} +Release: 9.1%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPL-3.0-or-later @@ -149,6 +149,9 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1-9.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Sep 24 2022 Maxwell G - 1-8.1 - Refactor %%ansible_collection_url, %%ansible_collection_install, %%ansible_test_unit. From e967649fbc346070d998c134875ab6d5d074be6f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 11 May 2023 22:52:54 +0000 Subject: [PATCH 26/31] remove unnecessary bashisms --- ansible-packaging.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 3b8cd3f..03d5a78 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -114,18 +114,18 @@ errors rpm_eval -E '%%ansible_collection_url' echo echo echo "Ensure macro works when both arguments are passed and no control macros are set" -[[ $(rpm_eval -E '%%ansible_collection_url community general') == \ - "https://galaxy.ansible.com/community/general" ]] +[ "$(rpm_eval -E '%%ansible_collection_url community general')" = \ + "https://galaxy.ansible.com/community/general" ] echo echo "Ensure macro works with the control macros" -[[ $(rpm_eval -D 'collection_namespace ansible' -D 'collection_name posix' \ - -E '%%ansible_collection_url') == "https://galaxy.ansible.com/ansible/posix" ]] +[ "$(rpm_eval -D 'collection_namespace ansible' -D 'collection_name posix' \ + -E '%%ansible_collection_url')" = "https://galaxy.ansible.com/ansible/posix" ] echo echo "Ensure macro prefers the collection namespace and name passed as an argument over the control macros" -[[ $(rpm_eval -D 'collection_namespace ansible' -D 'collection_name posix' \ - -E '%%ansible_collection_url community general') == "https://galaxy.ansible.com/community/general" ]] +[ "$(rpm_eval -D 'collection_namespace ansible' -D 'collection_name posix' \ + -E '%%ansible_collection_url community general')" = "https://galaxy.ansible.com/community/general" ] From 62d087930acb128f13f8c096f1cf944ba6ffd7e0 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 11 May 2023 22:53:01 +0000 Subject: [PATCH 27/31] collection_install: disable GALAXY_COLLECTIONS_PATH_WARNING This silences spurious warnings when installing collections into a directory outside ansible's configured collections path. Relates: https://github.com/ansible/ansible/pull/78487 --- ansible-packaging.spec | 5 ++++- ansible_collection.py | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 03d5a78..1a5ec61 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,6 +1,6 @@ Name: ansible-packaging Version: 1 -Release: 9.1%{?dist} +Release: 10%{?dist} Summary: RPM packaging macros and generators for Ansible collections License: GPL-3.0-or-later @@ -149,6 +149,9 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume %changelog +* Thu May 11 2023 Maxwell G - 1-10 +- %%ansible_collection_install - disable spurious collections path warnings + * Wed Jan 18 2023 Fedora Release Engineering - 1-9.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/ansible_collection.py b/ansible_collection.py index 70093be..80c4b33 100755 --- a/ansible_collection.py +++ b/ansible_collection.py @@ -19,6 +19,7 @@ the provided arguments. """ import argparse +import os import shutil import subprocess import sys @@ -96,7 +97,12 @@ class AnsibleCollection: # Without this, the print statements are shown after the command # output when building in mock. sys.stdout.flush() - subprocess.run(args, cwd=temppath, check=True) + subprocess.run( + args, + cwd=temppath, + check=True, + env={**os.environ, "ANSIBLE_GALAXY_COLLECTIONS_PATH_WARNING": "0"}, + ) def parseargs() -> argparse.Namespace: From 4cecf06ccb82d5cdabd1bae98ffca56eb85eabe0 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 11 May 2023 22:54:29 +0000 Subject: [PATCH 28/31] tests: remove pytest-forked req with core 2.16 ansible-test units doesn't depend on pytest-forked as of https://github.com/ansible/ansible/commit/676b731e6f7d60ce6fd48c0d1c883fc85f5c6537. This is expected to land in ansible-core 2.16. --- ansible-packaging.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index 1a5ec61..e1b9a1f 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -48,7 +48,7 @@ Requires: /usr/bin/ansible-test Requires: %{py3_dist pytest} Requires: %{py3_dist pytest-mock} Requires: %{py3_dist pytest-xdist} -Requires: %{py3_dist pytest-forked} +Requires: (%{py3_dist pytest-forked} if ansible-core < 2.16~~) Requires: %{py3_dist pyyaml} # mock is included in the list upstream, but is deprecated in Fedora. # Maintainers should work with upstream to add compat code to support @@ -151,6 +151,7 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume %changelog * Thu May 11 2023 Maxwell G - 1-10 - %%ansible_collection_install - disable spurious collections path warnings +- ansible-packaging-tests - don't depend on pytest-forked with ansible-core 2.16 * Wed Jan 18 2023 Fedora Release Engineering - 1-9.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 64a06a48437baeb139bb660d8e03054e8b31009a Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 11 May 2023 22:53:00 +0000 Subject: [PATCH 29/31] include LICENSE in ansible-srpm-macros --- ansible-packaging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-packaging.spec b/ansible-packaging.spec index e1b9a1f..b3ca0dd 100644 --- a/ansible-packaging.spec +++ b/ansible-packaging.spec @@ -1,3 +1,5 @@ +%global _docdir_fmt ansible-packaging + Name: ansible-packaging Version: 1 Release: 10%{?dist} @@ -130,7 +132,6 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume %files -%license COPYING %{_fileattrsdir}/ansible.attr %{_rpmmacrodir}/macros.ansible %{_rpmconfigdir}/ansible-generator @@ -138,6 +139,7 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume %files -n ansible-srpm-macros +%license COPYING %{_rpmmacrodir}/macros.ansible-srpm # ansible-core in RHEL 8.6 is built against python38. In c8s and the next RHEL @@ -152,6 +154,7 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume * Thu May 11 2023 Maxwell G - 1-10 - %%ansible_collection_install - disable spurious collections path warnings - ansible-packaging-tests - don't depend on pytest-forked with ansible-core 2.16 +- ansible-srpm-macros - include license file in the package * Wed Jan 18 2023 Fedora Release Engineering - 1-9.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 280a87e80bbd3391297c87278fe123d1443b182e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 12 May 2023 17:37:06 +0000 Subject: [PATCH 30/31] add tmt tests to rebuild dependents --- .fmf/version | 1 + tests/rebuild.fmf | 16 ++++++++++++++++ tests/rebuild.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 .fmf/version create mode 100644 tests/rebuild.fmf create mode 100755 tests/rebuild.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/rebuild.fmf b/tests/rebuild.fmf new file mode 100644 index 0000000..a1414be --- /dev/null +++ b/tests/rebuild.fmf @@ -0,0 +1,16 @@ +summary: Rebuild dependents to ensure that builds pass +discover: + - name: Rebuild collection packages + how: shell + tests: + - name: Rebuild ansible-collection-community-docker + test: tests/rebuild.sh ansible-collection-community-docker + require: + - ansible-core + - ansible-packaging + - ansible-srpm-macros + - fedpkg + - rpm-build + - sudo +execute: + how: tmt diff --git a/tests/rebuild.sh b/tests/rebuild.sh new file mode 100755 index 0000000..fbbb8b8 --- /dev/null +++ b/tests/rebuild.sh @@ -0,0 +1,27 @@ +#!/usr/bin/bash -x +set -euo pipefail + +package="${1}" + +cat <<'EOF' > ~/.rpmmacros +%_topdir %(echo $HOME)/rpmbuild +%_sourcedir %(pwd) +%_srcrpmdir %(pwd) +%_rpmdir %(pwd)/rpms +EOF + +mkdir -p clones +cd clones +fedpkg clone -a "${package}" +cd "${package}" +fedpkg srpm +sudo dnf builddep -y *.src.rpm +rc=0 +rpmbuild --rebuild *.src.rpm | tee build.log || rc=$? + +# move the results to the artifacts directory, so we can examine them +artifacts="${TEST_ARTIFACTS:-/tmp/artifacts}" +mkdir -p "${artifacts}" +mv -v *.rpm rpms/*/* build.log "${artifacts}/" || : + +exit "${rc}" From b7bd526bc805dba89371fc4bc0e986b34597fc4b Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 19:11:22 +0300 Subject: [PATCH 31/31] Remove unnecessary files --- .fmf/version | 1 - README.md | 3 --- sources | 0 tests/rebuild.fmf | 16 ---------------- tests/rebuild.sh | 27 --------------------------- 5 files changed, 47 deletions(-) delete mode 100644 .fmf/version delete mode 100644 README.md delete mode 100644 sources delete mode 100644 tests/rebuild.fmf delete mode 100755 tests/rebuild.sh diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/README.md b/README.md deleted file mode 100644 index 75796d1..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ansible-packaging - -The ansible-packaging package diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 diff --git a/tests/rebuild.fmf b/tests/rebuild.fmf deleted file mode 100644 index a1414be..0000000 --- a/tests/rebuild.fmf +++ /dev/null @@ -1,16 +0,0 @@ -summary: Rebuild dependents to ensure that builds pass -discover: - - name: Rebuild collection packages - how: shell - tests: - - name: Rebuild ansible-collection-community-docker - test: tests/rebuild.sh ansible-collection-community-docker - require: - - ansible-core - - ansible-packaging - - ansible-srpm-macros - - fedpkg - - rpm-build - - sudo -execute: - how: tmt diff --git a/tests/rebuild.sh b/tests/rebuild.sh deleted file mode 100755 index fbbb8b8..0000000 --- a/tests/rebuild.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/bash -x -set -euo pipefail - -package="${1}" - -cat <<'EOF' > ~/.rpmmacros -%_topdir %(echo $HOME)/rpmbuild -%_sourcedir %(pwd) -%_srcrpmdir %(pwd) -%_rpmdir %(pwd)/rpms -EOF - -mkdir -p clones -cd clones -fedpkg clone -a "${package}" -cd "${package}" -fedpkg srpm -sudo dnf builddep -y *.src.rpm -rc=0 -rpmbuild --rebuild *.src.rpm | tee build.log || rc=$? - -# move the results to the artifacts directory, so we can examine them -artifacts="${TEST_ARTIFACTS:-/tmp/artifacts}" -mkdir -p "${artifacts}" -mv -v *.rpm rpms/*/* build.log "${artifacts}/" || : - -exit "${rc}"