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.

Sign up for GitHub

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

image: remove vestigial -C for compliance dock support #111

Closed
wants to merge 1 commit into from
Closed

image: remove vestigial -C for compliance dock support #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/projects.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ cargo_build = false
auto_update = true

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
96 changes: 0 additions & 96 deletions image/templates/gimlet/zfs-compliance.json
View file
Open in desktop

This file was deleted.

21 changes: 2 additions & 19 deletions tools/helios-build/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,6 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
opts.optopt("o", "", "output directory for image", "DIR");
opts.optmulti("F", "", "pass extra image builder features", "KEY[=VAL]");
opts.optflag("B", "", "include omicron1 brand");
opts.optopt("C", "", "compliance dock location", "DOCK");
opts.optopt("N", "name", "image name", "NAME");
opts.optflag("R", "", "recovery image");
opts.optmulti("X", "", "skip this phase", "PHASE");
Expand All @@ -1235,8 +1234,7 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {

let log = ca.log;
let res = opts.parse(ca.args.iter())?;
let cdock = res.opt_str("C");
let brand = res.opt_present("B") || cdock.is_some();
let brand = res.opt_present("B");
let (publisher, extrepo) = if let Some(arg) = res.opt_str("p") {
if let Some((key, val)) = arg.split_once('=') {
(key.to_string(), Some(val.to_string()))
Expand Down Expand Up @@ -1450,11 +1448,6 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
cmd.arg("-F").arg(&format!("genproto={}",
genproto.to_str().unwrap()));
}
if let Some(cdock) = &cdock {
cmd.arg("-F").arg("compliance");
cmd.arg("-F").arg("stress");
cmd.arg("-E").arg(&cdock);
}
cmd.arg("-E").arg(&brand_extras);
cmd.arg("-E").arg(&projects_extras);
cmd.arg("-F").arg(format!("repo_publisher={}", publisher));
Expand Down Expand Up @@ -1516,7 +1509,6 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
}

let tname = if recovery { "zfs-recovery" }
else if cdock.is_some() { "zfs-compliance" }
else { "zfs" };
info!(log, "image builder template: {}...", tname);
let mut cmd = basecmd();
Expand Down Expand Up @@ -1673,16 +1665,7 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
/*
* Create the image and extract the checksum:
*/
let target_size = if cdock.is_some() {
/*
* In the compliance rack we would like to avoid running out of space,
* and we have no customer workloads, so using more RAM for the ramdisk
* pool is OK.
*/
16 * 1024
} else {
4 * 1024
};
let target_size = 4 * 1024;
info!(log, "creating Oxide boot image...");
let mut cmd = Command::new(&mkimage);
cmd.arg("-i").arg(&raw);
Expand Down