Skip to content

Commit 252e4fd

Browse files
committed
remove sanity stage (it finishes too fast)
Signed-off-by: Antheas Kapenekakis <git@antheas.dev>
1 parent 99c270b commit 252e4fd

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

lib/src/deploy.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const BASE_IMAGE_PREFIX: &str = "ostree/container/baseimage/bootc";
3434
/// Set on an ostree commit if this is a derived commit
3535
const BOOTC_DERIVED_KEY: &str = "bootc.derived";
3636

37-
const DEPLOY_STEPS: usize = 5;
37+
const DEPLOY_STEPS: usize = 4;
3838

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

345-
prog.send(ProgressStage::Deploy {
346-
n_steps: DEPLOY_STEPS,
347-
step: 1,
348-
name: "sanity_check".to_string(),
349-
});
350-
351345
if let Some(msg) =
352346
ostree_container::store::image_filtered_content_warning(repo, &wrote_imgref.imgref)
353347
.context("Image content warning")?
@@ -538,7 +532,7 @@ pub(crate) async fn stage(
538532
) -> Result<()> {
539533
prog.send(ProgressStage::Deploy {
540534
n_steps: DEPLOY_STEPS,
541-
step: 2,
535+
step: 1,
542536
name: "deploying".to_string(),
543537
});
544538
let merge_deployment = sysroot.merge_deployment(Some(stateroot));
@@ -554,14 +548,14 @@ pub(crate) async fn stage(
554548

555549
prog.send(ProgressStage::Deploy {
556550
n_steps: DEPLOY_STEPS,
557-
step: 3,
551+
step: 2,
558552
name: "pulling_bound_images".to_string(),
559553
});
560554
crate::boundimage::pull_bound_images(sysroot, &deployment).await?;
561555

562556
prog.send(ProgressStage::Deploy {
563557
n_steps: DEPLOY_STEPS,
564-
step: 4,
558+
step: 3,
565559
name: "cleaning_up".to_string(),
566560
});
567561
crate::deploy::cleanup(sysroot).await?;

0 commit comments

Comments
 (0)