add CONTEST_CONTENT_PR and CONTEST_OSCAP_PR #127
Conversation
| adjust+: | ||
| - prepare+: |
There was a problem hiding this comment.
FYI: This is just moving all the code from adjust to root-level prepare, since there was no need for the adjust (no condition specified).
Signed-off-by: Jiri Jaburek <[email protected]>
| adjust: | ||
| - prepare: | ||
| - prepare+: |
There was a problem hiding this comment.
Why +? It doesn't inherit from top level, leaving prepare: would make it clean for reader no additional prepare steps coming from top.
There was a problem hiding this comment.
I remember thinking the same and testing it, and it removed the other prepare content.
What I think is happening is that adjust is being applied on top of regular dictionary keys, so if /plans/foobar.fmf specifies prepare:, it gets used first, and then all the adjusts are applied, starting from the top-level /plans/main.fmf.
| if ! rpm -q epel-release; then | ||
| curl -o epel-release.rpm --retry 10 https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm | ||
| curl --retry 10 -sSfkL -o epel-release.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm |
There was a problem hiding this comment.
I'd prefer long form options
There was a problem hiding this comment.
Generally, I do too, but we use curl short options on many places (at least internally) to the point where it became sort of a habit. As in - one should never use curl without these (for "gimme what's on that URL" style of use cases).
Writing it out would be a lot longer and need line breaks,
curl --output epel-release.rpm --retry 10 --silent --show-error --fail --insecure --location https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
especially -o (as an alternative to wget) I've never seen expanded to --output.
I modified this line only because I added the extra curl options elsewhere and thought it's a good idea to keep the options consistent across plans.
So I personally prefer the short options for curl, but I can use the long ones if it matters to you.
Fixes #124