Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions .github/workflows/ci_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,28 @@ jobs:
run: |
set -euo pipefail
BIN=./target/release/eb-stack
# Drafts alone leave stack deps missing; exit non-zero is correct.
# Still exercises parse + packaging_gate on the draft-PR snapshot.
# Drafts alone leave stack deps missing, so recipe check must fail on
# unresolved dependencies after parse and packaging_gate pass on the
# draft-PR snapshot, with the drafts supplying their own packages.
OUT=$(mktemp -d)
if "$BIN" recipe check \
--recipe fixtures/eon_core_rgpot/easyconfigs/e/eOn/eOn-2.17.2-foss-2026.1.eb \
--recipe fixtures/eon_core_rgpot/easyconfigs/e/eOn/eOn-2.17.10-foss-2026.1.eb \
--easyconfigs fixtures/eon_core_rgpot/easyconfigs \
--require-configopt=-Dwith_rgpot=true; then
--require-configopt=-Dwith_rgpot=true >"$OUT/check.out" 2>"$OUT/check.err"; then
echo "expected recipe check to fail without robot deps" >&2
exit 1
fi
cat "$OUT/check.err"
if ! grep -qx 'error: recipe has [0-9][0-9]* unresolved dependencies' "$OUT/check.err"; then
echo "expected recipe check to fail on unresolved dependencies only" >&2
exit 1
fi
for draft in quill readcon-core rgpot; do
if ! grep -q "\"runtime:$draft-" "$OUT/check.out"; then
echo "expected the drafts to supply $draft" >&2
exit 1
fi
done

portable-candidate:
name: portable Linux candidate (no publication)
Expand Down
1 change: 1 addition & 0 deletions changelog.d/+eon-smoke-fixture.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The CI smoke step on the eOn core fixture checks `eOn-2.17.10-foss-2026.1.eb`, the recipe the fixture holds, and passes only when `recipe check` fails on the stack dependencies the drafts leave out, with the drafts supplying quill, readcon-core and rgpot. It named the 2.17.2 recipe the fixture no longer has, so it passed on "No such file or directory" without checking anything. `tests/eon_core_rgpot.rs` runs the step as CI runs it.
120 changes: 119 additions & 1 deletion tests/eon_core_rgpot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
use eb_stack::{
check_recipe_deps, packaging_gate, parse_easyconfig_trees, resolve_easyconfig_file,
};
use std::path::PathBuf;
use std::os::unix::fs::PermissionsExt;
use std::path::{Path, PathBuf};
use std::process::Command;

mod common;

Expand Down Expand Up @@ -344,3 +346,119 @@ fn eon_core_recipe_copies_do_not_drift() {
assert_eq!(canonical, copy, "{copy_rel} drifted from {canonical_rel}");
}
}

const SMOKE_STEP: &str = "recipe packaging gate on eOn core fixture";

/// The `run: |` script of the ci_test.yml step named `name`, dedented.
fn ci_step(name: &str) -> String {
let manifest = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
let ci = std::fs::read_to_string(manifest.join(".github/workflows/ci_test.yml"))
.expect("read ci_test.yml");
let header = format!("- name: {name}");
let mut lines = ci
.lines()
.skip_while(|line| line.trim() != header)
.skip(1)
.peekable();
assert_eq!(
lines.next().map(str::trim),
Some("run: |"),
"ci_test.yml has no step {name:?} with a run block"
);
let indent = lines
.peek()
.map(|line| line.len() - line.trim_start().len())
.expect("the run block has a body");
lines
.take_while(|line| line.trim().is_empty() || line.len() - line.trim_start().len() >= indent)
.map(|line| format!("{}\n", line.get(indent..).unwrap_or("")))
.collect()
}

/// Run a CI step's script as the runner's bash does, with `BIN` set to `bin`
/// instead of the release build.
fn run_step(script: &str, bin: &Path) -> std::process::Output {
let release = "BIN=./target/release/eb-stack\n";
assert!(script.contains(release), "the step sets {release:?}");
let quoted = bin.display().to_string().replace('\'', r"'\''");
Command::new("bash")
.arg("-ec")
.arg(script.replace(release, &format!("BIN='{quoted}'\n")))
.current_dir(env!("CARGO_MANIFEST_DIR"))
.output()
.expect("run bash")
}

/// A smoke step that expects `recipe check` to fail passes on any error, so a
/// recipe renamed under it leaves it passing on "No such file or directory".
#[test]
fn ci_smoke_step_names_paths_that_exist() {
let manifest = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
let step = ci_step(SMOKE_STEP);
let named: Vec<_> = step
.split_whitespace()
.filter(|word| word.starts_with("fixtures/"))
.collect();
assert!(!named.is_empty(), "the step names no fixture:\n{step}");
for path in named {
assert!(
manifest.join(path).exists(),
"{SMOKE_STEP:?} names {path}, which does not exist"
);
}
}

/// The step expects `recipe check` to fail only because the drafts leave the
/// stack's own dependencies unresolved. Run as CI runs it, it passes with
/// eb-stack and fails when the check fails for any other reason.
#[test]
fn ci_smoke_step_accepts_only_the_unresolved_stack_dependencies() {
let step = ci_step(SMOKE_STEP);
let real = run_step(&step, Path::new(env!("CARGO_BIN_EXE_eb-stack")));
assert!(
real.status.success(),
"the step fails with eb-stack:\n{}{}",
String::from_utf8_lossy(&real.stdout),
String::from_utf8_lossy(&real.stderr)
);

let impostors = [
(
"a recipe that does not exist",
"",
"error: --recipe fixtures/eon_core_rgpot/easyconfigs/e/eOn/eOn-2.17.2-foss-2026.1.eb: No such file or directory (os error 2)",
),
(
"a failed packaging gate",
"",
"error: packaging gate failed: configopts lack -Dwith_rgpot=true",
),
(
"drafts that do not resolve",
r#" "found": []"#,
"error: recipe has 14 unresolved dependencies",
),
];
let dir = tempfile::tempdir().expect("tempdir");
let stubs: Vec<_> = impostors
.iter()
.enumerate()
.map(|(i, (_, stdout, stderr))| {
let stub = dir.path().join(format!("eb-stack-{i}"));
std::fs::write(
&stub,
format!("#!/bin/sh\necho '{stdout}'\necho '{stderr}' >&2\nexit 1\n"),
)
.expect("write stub");
std::fs::set_permissions(&stub, std::fs::Permissions::from_mode(0o755))
.expect("chmod stub");
stub
})
.collect();
for ((why, _, _), stub) in impostors.iter().zip(&stubs) {
assert!(
!run_step(&step, stub).status.success(),
"the step passes when recipe check fails on {why}"
);
}
}
Loading