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

ci: adapt to new buildroot image #1182

Merged
merged 1 commit into from
Mar 25, 2021
Merged

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Mar 25, 2021

We're moving away from a buildroot image based on cosa, so we need to do
our build in a separate pod. This is more complex, but the upside is
that it guarantees that we're always building in the same buildroot that
was used to build all of FCOS' components.

@jlebon
Copy link
Member Author

jlebon commented Mar 25, 2021

Requires: coreos/coreos-ci-lib#66

.cci.jenkinsfile Outdated
withEnv(["XDG_CACHE_HOME=${env.WORKSPACE}/cache"]) {
stage("Build") {
shwrap("make")
shwrap("make install DESTDIR=install")
Copy link
Member Author

Choose a reason for hiding this comment

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

The DESTDIR=install bit and overlays: "install" bit below is kinda awkward. We can look at adding more sugar for this in the future.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah definitely, centralizing and standardizing this is IMO a lot of the goal.

.cci.jenkinsfile Outdated
withEnv(["XDG_CACHE_HOME=${env.WORKSPACE}/cache"]) {
stage("Build") {
shwrap("make")
shwrap("make install DESTDIR=install")
Copy link
Member

Choose a reason for hiding this comment

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

Yeah definitely, centralizing and standardizing this is IMO a lot of the goal.

@cgwalters cgwalters closed this Mar 25, 2021
@cgwalters cgwalters reopened this Mar 25, 2021
cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request Mar 25, 2021
@jlebon jlebon marked this pull request as draft March 25, 2021 19:07
@jlebon jlebon force-pushed the pr/ci-adapt branch 2 times, most recently from 1b506b6 to c781533 Compare March 25, 2021 19:12
We're moving away from a buildroot image based on cosa, so we need to do
our build in a separate pod. This is more complex, but the upside is
that it guarantees that we're always building in the same buildroot that
was used to build all of FCOS' components.
@jlebon jlebon marked this pull request as ready for review March 25, 2021 20:41
@jlebon
Copy link
Member Author

jlebon commented Mar 25, 2021

OK cool, this works! ✔️

@jlebon
Copy link
Member Author

jlebon commented Mar 25, 2021

(This patch also makes a small improvement: it more correctly limits the "blackbox" stage to only run that test, whereas before it ran all of ext.*. So now it's easier to tell if that's what failed.)

@bgilbert bgilbert merged commit f79f2ab into coreos:master Mar 25, 2021
cgwalters added a commit to coreos/rpm-ostree that referenced this pull request Mar 26, 2021
jlebon added a commit to jlebon/ssh-key-dir that referenced this pull request Mar 29, 2021
jlebon added a commit to jlebon/ssh-key-dir that referenced this pull request Mar 29, 2021
Similar to coreos/ignition#1182 as a result of
coreos/fedora-coreos-config#740.

As a bonus, we now get a clear separate stage for building. Add a stage
for running unit tests, but keep it commented out for now and we'll
circle back to it when it's cleaner to do once we have:

coreos/fedora-coreos-config#917

GitHub Actions covers unit tests anyway.
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.

4 participants