Skip to content

Commit

Permalink
remove sanity stage (it finishes too fast)
Browse files Browse the repository at this point in the history
Signed-off-by: Antheas Kapenekakis <[email protected]>
  • Loading branch information
antheas committed Nov 27, 2024
1 parent 99c270b commit 252e4fd
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions lib/src/deploy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const BASE_IMAGE_PREFIX: &str = "ostree/container/baseimage/bootc";
/// Set on an ostree commit if this is a derived commit
const BOOTC_DERIVED_KEY: &str = "bootc.derived";

const DEPLOY_STEPS: usize = 5;
const DEPLOY_STEPS: usize = 4;

/// Variant of HostSpec but required to be filled out
pub(crate) struct RequiredHostSpec<'a> {
Expand Down Expand Up @@ -342,12 +342,6 @@ pub(crate) async fn pull(
let import = import?;
let wrote_imgref = target_imgref.as_ref().unwrap_or(&ostree_imgref);

prog.send(ProgressStage::Deploy {
n_steps: DEPLOY_STEPS,
step: 1,
name: "sanity_check".to_string(),
});

if let Some(msg) =
ostree_container::store::image_filtered_content_warning(repo, &wrote_imgref.imgref)
.context("Image content warning")?
Expand Down Expand Up @@ -538,7 +532,7 @@ pub(crate) async fn stage(
) -> Result<()> {
prog.send(ProgressStage::Deploy {
n_steps: DEPLOY_STEPS,
step: 2,
step: 1,
name: "deploying".to_string(),
});
let merge_deployment = sysroot.merge_deployment(Some(stateroot));
Expand All @@ -554,14 +548,14 @@ pub(crate) async fn stage(

prog.send(ProgressStage::Deploy {
n_steps: DEPLOY_STEPS,
step: 3,
step: 2,
name: "pulling_bound_images".to_string(),
});
crate::boundimage::pull_bound_images(sysroot, &deployment).await?;

prog.send(ProgressStage::Deploy {
n_steps: DEPLOY_STEPS,
step: 4,
step: 3,
name: "cleaning_up".to_string(),
});
crate::deploy::cleanup(sysroot).await?;
Expand Down

0 comments on commit 252e4fd

Please sign in to comment.