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

remove /plans/upstream, replace it with CONTEST_CONTENT_LATEST #145

Merged
merged 4 commits into from
Apr 9, 2024

Conversation

comps
Copy link
Contributor

@comps comps commented Apr 8, 2024

This fixes #141 - see it for rationale behind this change.

Also, you might want to review by commits - there have been two other smaller unrelated changes.

comps added 2 commits April 8, 2024 17:59
Signed-off-by: Jiri Jaburek <comps@nomail.dom>
Signed-off-by: Jiri Jaburek <comps@nomail.dom>
@comps comps marked this pull request as ready for review April 9, 2024 12:50
`CONTEST_CONTENT` to point to it.
- Essentially, this is like `CONTEST_CONTENT` but without you having to
provide a cloned directory, Contest automatically clones it for you.
- Do not specify `CONTEST_CONTENT` in combination with this option.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also mention to not specify in combination CONTEST_CONTENT_PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't want to go the route of mentioning every possible variable combination with every other one. It occurred to me that I could mention it, but when we add more (conflicting) variables, we would have to create a matrix of which variable cannot be used with which other ones, and document it.

Instead, I would prefer to rely on common sense that is implied by the explanation - the PR text describes how it differs from LATEST, implying both are mutually exclusive.

use one or the other.
- This is like `CONTEST_CONTENT_LATEST`, but instead of using the default
branch, it checks out repository contents specific to the pull request.
- Do not specify `CONTEST_CONTENT` in combination with this option.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mention to not specify in combination with CONTEST_CONTENT_LATEST

docs/TESTS.md Outdated

These specifically

1. harden the OS installation via some means (`oscap`, Ansible, etc.)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It look weird when oscap is as code (oscap) and Ansible not. I'd prefer it unified

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough, I've replaced it with non-code OpenSCAP.

comps added 2 commits April 9, 2024 16:54
Signed-off-by: Jiri Jaburek <comps@nomail.dom>
This is useful when trying to figure out where the datastream
came from, eg. whether CONTEST_CONTENT works.

Signed-off-by: Jiri Jaburek <comps@nomail.dom>
@comps comps force-pushed the remove_upstream branch from f2fa383 to ba0e5cb Compare April 9, 2024 14:55
@mildas mildas merged commit dd54b6e into main Apr 9, 2024
3 checks passed
@mildas mildas deleted the remove_upstream branch April 9, 2024 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Re-do /plans/upstream as a CONTEST_* variable
2 participants