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

[rhcos-4.11] Backport yumrepos changes; cci.Jenkinsfile changes #3160

Merged
merged 10 commits into from
Nov 4, 2022

Conversation

dustymabe
Copy link
Member

No description provided.

@dustymabe dustymabe changed the base branch from rhcos-4.11 to rhcos-4.11-new November 3, 2022 20:21
@dustymabe
Copy link
Member Author

prow/rhcos CI for these isn't going to work because of the branch name.

warning: Could not find remote branch release-4.11-new to clone.

dustymabe and others added 8 commits November 4, 2022 07:57
It doesn't work properly against these rhcos- branches anyway. Let's
just limit the testing to building the container and running check
and unittest tests.
Make the `tarball` argument last. Prep for making it optional.

(cherry picked from commit d8a76e9)
For the upcoming yumrepos, we don't want to publish a tarball of it. We
still want the git rev information though. Make the tarball argument
optional.

(cherry picked from commit 606e61b)
Add a new option `--yumrepos` option to `cosa init` to allow import of
yum repo files and content sets located outside of the source git.

Motivation: RHCOS needs yum repo definitions hidden behind a firewall.
Let's add a clean way to import them.

Co-authored-by: Jonathan Lebon <jonathan@jlebon.com>
(cherry picked from commit ddcba9f)
Use `-type f` to only copy files, and `-maxdepth 1` so we don't recurse
into random e.g. test fixtures, etc...

(cherry picked from commit 1ab650d)
It's DRYer. Prep for adding another symlink to handle.

(cherry picked from commit 9d50294)
Just like the main source config, support passing an existing git
checkout to `--yumrepos` for a better local dev experience.

(cherry picked from commit 6b37c6f)
This can be used to conveniently skip those tests by tag.

(cherry picked from commit 586a6dd)
Support passing e.g. `--tag !foo` to exclude all tests with tag `foo`.

(cherry picked from commit db9cc1a)
@openshift-ci
Copy link

openshift-ci bot commented Nov 4, 2022

@dustymabe: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/rhcos a5b0d93 link true /test rhcos

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

From a discussion OOB about these backports: in general, it's hard for reviewers to review these and verify that no other backports are missing. We will trust the backporter and focus review on:

  • any commits that aren't pure cherry-picks
  • any cherry-picks that resulted in merge conflicts (this should be signaled in the commit message, under the (cherry picked from commit xxxxxxx) footer)
  • any commits the backporter wants the reviewer to pay special attention to

@dustymabe
Copy link
Member Author

prow/rhcos is going to fail with Could not find remote branch release-4.11-new. Merging this.

@dustymabe dustymabe merged commit 619b9f2 into coreos:rhcos-4.11-new Nov 4, 2022
@dustymabe dustymabe deleted the dusty-4.11-backport branch November 4, 2022 15:13
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.

None yet

2 participants