Skip to content

Commit

Permalink
Merge pull request #1291 from coreos/dependabot/cargo/nix-0.27.1
Browse files Browse the repository at this point in the history
build(deps): bump nix from 0.26.2 to 0.27.1
  • Loading branch information
prestist authored Sep 11, 2023
2 parents fdff8f1 + 2247ffe commit 0ecdcb6
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 20 deletions.
23 changes: 18 additions & 5 deletions .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,31 @@ cosaPod(buildroot: true, runAsUser: 0) {
// Make sure cosa is using the binary we just built.
shwrap("rsync -rlv install/usr/ /usr/")

cosaBuild(skipKola: true, overlays: ["install"])
// XXX: temporarily build FCOS manually until virtiofs can work with uid 0
// https://gitlab.com/virtio-fs/virtiofsd/-/merge_requests/197
//cosaBuild(skipKola: true, overlays: ["install"])
shwrap("""
if [ "\$(id -u)" = 0 ]; then
exec runuser -u builder -- bash "\$0" "\$@"
fi
mkdir -p /srv/coreos && cd /srv/coreos
cosa init https://github.com/coreos/fedora-coreos-config
rsync -av ${env.WORKSPACE}/install/ /srv/coreos/overrides/rootfs
cosa fetch --strict
cosa build --strict --force
""")

// Skipping kdump.crash due to CI failure in coreos-installer repo
// https://github.com/coreos/fedora-coreos-tracker/issues/1075
kola(extraArgs: "--denylist-test ext.config.kdump.crash")

stage("Build metal+live") {
shwrap("cd /srv/coreos && cosa buildextend-metal")
shwrap("cd /srv/coreos && cosa buildextend-metal4k")
shwrap("cd /srv/coreos && cosa buildextend-live --fast")
shwrap("cd /srv/coreos && runuser -u builder -- cosa buildextend-metal")
shwrap("cd /srv/coreos && runuser -u builder -- cosa buildextend-metal4k")
shwrap("cd /srv/coreos && runuser -u builder -- cosa buildextend-live --fast")
// Test metal with an uncompressed image and metal4k with a
// compressed one
shwrap("cd /srv/coreos && cosa compress --fast --artifact=metal4k")
shwrap("cd /srv/coreos && runuser -u builder -- cosa compress --fast --artifact=metal4k")
}
stage("Test ISO") {
// No need to run the iso-live-login/iso-as-disk scenarios
Expand Down
17 changes: 3 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ hex = "^0.4"
ignition-config = ">= 0.3, < 0.4"
lazy_static = "^1.4"
libc = "^0.2"
nix = ">= 0.24, < 0.27"
nix = { version = ">= 0.24, < 0.28", "default_features" = false, "features" = [ "dir", "ioctl", "mount", "process", "sched", "signal", "user"] }
nmstate = { version = ">= 2.2.3, < 3", default-features = false, features = ["gen_conf"] }
openssl = "^0.10"
pipe = ">= 0.3, < 0.5"
Expand Down

0 comments on commit 0ecdcb6

Please sign in to comment.