Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport repos.git to RHEL8 #772

Merged
merged 11 commits into from Jun 27, 2019
Merged

Backport repos.git to RHEL8 #772

merged 11 commits into from Jun 27, 2019

Conversation

bcl
Copy link
Contributor

@bcl bcl commented Jun 20, 2019

No description provided.

@bcl bcl requested review from atodorov and jikortus June 20, 2019 17:30
@bcl
Copy link
Contributor Author

bcl commented Jun 20, 2019

@atodorov looks like the jenkins systems need to have python3-rpmfluff installed (and probably git as well).

@coveralls
Copy link

coveralls commented Jun 20, 2019

Pull Request Test Coverage Report for Build 1840

  • 122 of 127 (96.06%) changed or added relevant lines in 3 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+1.03%) to 52.439%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/pylorax/api/gitrpm.py 96 101 95.05%
Totals Coverage Status
Change from base Build 1757: 1.03%
Covered Lines: 2806
Relevant Lines: 5149

💛 - Coveralls

bcl added 9 commits June 26, 2019 16:14
This adds support, documentation, and testing for a [[repos.git]]
blueprint section that can be used to install files from a git
repository. It will create an rpm that will be added to the build,
and included in the metadata that can be downloaded. This allows you to
accurately keep track of the source of configuration files and extra
metadata that is added to the build.

The source repo and reference will be listed in the rpm's summary making
it easy to discover on the installed system.

(cherry picked from commit d7b96c8)

Resolves: rhbz#1709594
This handles creating the rpm from the dictionary describing the
repository and rpm. Also adds tests for archive and rpm creation.

(cherry picked from commit f6f2308)

Related: rhbz#1709594
This hooks up creation of the rpm to the build, adds it to the
kickstart, and passes the url to Anaconda. The dnf repo with the rpms is
created under the results directory so it will be included when
downloading the build's results.

(cherry picked from commit cd8c884)

Related: rhbz#1709594
The freeze function was not being tested. Add a test for it using the
repos.git test recipe.

(cherry picked from commit c26477a)

Related: rhbz#1709594
Log them and report them as RuntimeError. Also add a couple tests for
them.

(cherry picked from commit 61efa91)

Related: rhbz#1709594
This way it can be shared with test_server.py

(cherry picked from commit 02f757d)

Related: rhbz#1709594
- Check final-kickstart.ks for the rpm source
- Check final-kickstart.ks for the rpm package name and version
- Make sure depsolve works
- Make sure errors from a bad repo are returned correctly
- Make sure errors from a bad reference are returned correctly

This moves _wait_for_status into a helper function so it can be shared
between the test classes.

(cherry picked from commit 8c2184d)

Related: rhbz#1709594
rpmfluff was including / in the rpm, which conflicts with
filesystem.rpm

The rpm globs are pretty limited, and we don't actually know the file
paths until later, so we have to use a glob or a directory.

So when the destination is / it now uses /* to select all the files and
sub-directories in the archive. The limitation of this is that it cannot
support dotfiles directly under /, they will cause a rpmbuild error.

For destinations other than / it uses the name of the directory, so
dotfiles are fine in that situation.

(cherry picked from commit 049f68c)

Related: rhbz#1709594
Make sure that dotfiles are installed when not directly under /
Make sure / is not packaged in the rpm (it will cause a conflict with
the filesystem package).
Make sure that using destination="/" works

(cherry picked from commit 6fd06c6)

Related: rhbz#1709594
Fixes weldr#771

Related: rhbz#1709594

Signed-off-by: Brian C. Lane <bcl@redhat.com>
Related: rhbz#1709594

Signed-off-by: Brian C. Lane <bcl@redhat.com>
@bcl bcl merged commit 4ac29da into weldr:rhel8-branch Jun 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants