diff --git a/changelog.d/+site-names.doc.md b/changelog.d/+site-names.doc.md new file mode 100644 index 00000000..c48f4be3 --- /dev/null +++ b/changelog.d/+site-names.doc.md @@ -0,0 +1 @@ +The shard how-to, tests and fixtures no longer carry one site's names: the `stack shard` examples build `site-2026e.list`, and the `--include-systems` values in the tests are `site-zen2` and `site`. diff --git a/docs/orgmode/howto/stack-shard.org b/docs/orgmode/howto/stack-shard.org index ccd97725..9565e4db 100644 --- a/docs/orgmode/howto/stack-shard.org +++ b/docs/orgmode/howto/stack-shard.org @@ -161,7 +161,7 @@ reads each such line's tree there, downloading the ones it lacks: #+begin_src bash eb-stack stack shard \ - --build-list Snel-2026e.list \ + --build-list site-2026e.list \ --easyconfigs easybuild-easyconfigs/easybuild/easyconfigs \ --commit-cache /scratch-shared/$USER/eb-stack-commit-trees \ --shards 4 \ @@ -185,7 +185,7 @@ clone (~git clone --filter=blob:none~) is enough: #+begin_src bash eb-stack stack shard \ - --build-list Snel-2026e.list \ + --build-list site-2026e.list \ --easyconfigs easybuild-easyconfigs/easybuild/easyconfigs \ --easyconfigs-repo easybuild-easyconfigs \ --materialize \ diff --git a/llms-full.txt b/llms-full.txt index 5591be69..14d277e4 100644 --- a/llms-full.txt +++ b/llms-full.txt @@ -5907,7 +5907,7 @@ reads each such line's tree there, downloading the ones it lacks: ```bash eb-stack stack shard \ - --build-list Snel-2026e.list \ + --build-list site-2026e.list \ --easyconfigs easybuild-easyconfigs/easybuild/easyconfigs \ --commit-cache /scratch-shared/$USER/eb-stack-commit-trees \ --shards 4 \ @@ -5931,7 +5931,7 @@ clone (`git clone --filter=blob:none`) is enough: ```bash eb-stack stack shard \ - --build-list Snel-2026e.list \ + --build-list site-2026e.list \ --easyconfigs easybuild-easyconfigs/easybuild/easyconfigs \ --easyconfigs-repo easybuild-easyconfigs \ --materialize \ diff --git a/src/jenkins.rs b/src/jenkins.rs index 407d4d93..96cda260 100644 --- a/src/jenkins.rs +++ b/src/jenkins.rs @@ -379,7 +379,7 @@ CP2K-2025.1-foss-2025a.eb\n"; #[test] fn a_list_regroups_under_the_previous_sections() { let sections = parse_sections(SECTIONED); - let list = "# Snel-2026 header\n\ + let list = "# Site-2026 header\n\ #\n\ #### 2. Closure ####\n\ # CP2K-2026.1-foss-2026.1.eb\n\ @@ -389,7 +389,7 @@ CP2K-2025.1-foss-2025a.eb\n"; # SeisSol-1.3.1-foss-2026.1.eb\n"; assert_eq!( group_by_sections(list, §ions, "New in this generation"), - "# Snel-2026 header\n\ + "# Site-2026 header\n\ #\n\ \n\ #### MPI Libraries ####\n\ diff --git a/src/shard_sources.rs b/src/shard_sources.rs index 5e0f5467..69215805 100644 --- a/src/shard_sources.rs +++ b/src/shard_sources.rs @@ -337,7 +337,7 @@ mod tests { fn plain_source_options_are_supported() { for line in [ format!("A-1.0.eb --from-commit={SHA}"), - format!("A-1.0.eb --from-commit {SHA} --include-systems=snel-zen2"), + format!("A-1.0.eb --from-commit {SHA} --include-systems=site-zen2"), format!("A-1.0.eb --robot --from-commit={SHA} --include-easyblocks-from-commit={SHA}"), format!("A-1.0.eb -r --rebuild --from-commit={SHA}"), ] { @@ -387,7 +387,7 @@ mod tests { format!("A-1.0.eb --from-commit={SHA} --rob=/x"), format!("A-1.0.eb --from-c={SHA}"), format!("A-1.0.eb --from-commit={SHA} --try-toolchain=GCC,15.2.0"), - format!("A-1.0.eb --from-commit={SHA} --include-systems snel"), + format!("A-1.0.eb --from-commit={SHA} --include-systems site"), format!("A-1.0.eb --from-commit={SHA} -D"), format!("A-1.0.eb --from-commit={SHA} --consider-archived-easyconfigs"), ] { @@ -399,11 +399,11 @@ mod tests { fn an_executable_line_drops_from_commit_and_appends_the_robot_paths() { assert_eq!( executable_line( - &format!("A-1.0.eb --from-commit={SHA} --include-systems=snel-zen2"), + &format!("A-1.0.eb --from-commit={SHA} --include-systems=site-zen2"), Some("/out/sources/v1/x/A-1.0.eb"), "/robot:/out/sources/v1/x" ), - "/out/sources/v1/x/A-1.0.eb --include-systems=snel-zen2 --robot-paths=/robot:/out/sources/v1/x" + "/out/sources/v1/x/A-1.0.eb --include-systems=site-zen2 --robot-paths=/robot:/out/sources/v1/x" ); assert_eq!( executable_line( diff --git a/src/site_commands.rs b/src/site_commands.rs index 5b7d96f5..afc49a06 100644 --- a/src/site_commands.rs +++ b/src/site_commands.rs @@ -4667,7 +4667,7 @@ mod tests { root, &format!( "Alpha-1.0-GCCcore-15.2.0.eb\n\ - Fetched-1.0-GCCcore-15.2.0.eb --from-commit={SHA} --include-systems=snel-zen2\n\ + Fetched-1.0-GCCcore-15.2.0.eb --from-commit={SHA} --include-systems=site-zen2\n\ Other-1.0-GCCcore-15.2.0.eb --from-commit={SHA}\n" ), ); @@ -4730,9 +4730,9 @@ mod tests { let mut args = request( root, &format!( - "PETSc-3.25.0-GCCcore-15.2.0.eb --include-systems=snel-zen2\n\ + "PETSc-3.25.0-GCCcore-15.2.0.eb --include-systems=site-zen2\n\ MUMPS-5.8.1-GCCcore-15.2.0.eb\n\ - petsc4py-3.25.0-GCCcore-15.2.0.eb --from-commit={SHA} --include-systems=snel-zen2\n" + petsc4py-3.25.0-GCCcore-15.2.0.eb --from-commit={SHA} --include-systems=site-zen2\n" ), ); args.commit_trees = vec![format!("{}={}", &SHA[..10], tree.display())]; @@ -4753,8 +4753,8 @@ mod tests { assert_eq!( read(root.join(shard_file)), format!( - "PETSc-3.25.0-GCCcore-15.2.0.eb --include-systems=snel-zen2\n\ - petsc4py-3.25.0-GCCcore-15.2.0.eb --from-commit={SHA} --include-systems=snel-zen2\n" + "PETSc-3.25.0-GCCcore-15.2.0.eb --include-systems=site-zen2\n\ + petsc4py-3.25.0-GCCcore-15.2.0.eb --from-commit={SHA} --include-systems=site-zen2\n" ) ); let with_petsc = shard_modules(&plan) diff --git a/tests/doc_walkthrough.rs b/tests/doc_walkthrough.rs index 6ab280fc..945442bf 100644 --- a/tests/doc_walkthrough.rs +++ b/tests/doc_walkthrough.rs @@ -52,6 +52,7 @@ const FORBIDDEN: &[&str] = &[ "App-1.0", "eb-stack/scripts", "/shared/", + "Snel", ]; #[test] diff --git a/tests/stack_shard.rs b/tests/stack_shard.rs index 88d3af97..5a9a54a1 100644 --- a/tests/stack_shard.rs +++ b/tests/stack_shard.rs @@ -285,7 +285,7 @@ fn fetched_and_unparsed_lines_are_planned_as_opaque_lines() { // The opaque line is written to its shard as it stands, flags and all. let shard_file = format!("{}.list", fetched["shard"].as_str().unwrap()); assert!(read(out.join(&shard_file)).contains( - "Bowtie2-2.5.5-GCC-15.2.0.eb --from-commit=e71b392cfab2449cb64f0ac5569cba75f0c5290d --include-systems=snel-zen2" + "Bowtie2-2.5.5-GCC-15.2.0.eb --from-commit=e71b392cfab2449cb64f0ac5569cba75f0c5290d --include-systems=site-zen2" )); } diff --git a/tests/stack_shard_fixtures/opaque.list b/tests/stack_shard_fixtures/opaque.list index 09867b0d..87dc8903 100644 --- a/tests/stack_shard_fixtures/opaque.list +++ b/tests/stack_shard_fixtures/opaque.list @@ -1,5 +1,5 @@ # wave 1 plus two lines eb-stack cannot resolve but EasyBuild can build OpenFOAM-13-GCCcore-15.2.0.eb --hooks=/sw/hooks/openfoam.py ParaView-6.0.0-GCCcore-15.2.0.eb -Bowtie2-2.5.5-GCC-15.2.0.eb --from-commit=e71b392cfab2449cb64f0ac5569cba75f0c5290d --include-systems=snel-zen2 +Bowtie2-2.5.5-GCC-15.2.0.eb --from-commit=e71b392cfab2449cb64f0ac5569cba75f0c5290d --include-systems=site-zen2 Opaque-1.0.eb diff --git a/tests/stack_shard_fixtures/wave1.list b/tests/stack_shard_fixtures/wave1.list index 6e80fcf8..90fee6df 100644 --- a/tests/stack_shard_fixtures/wave1.list +++ b/tests/stack_shard_fixtures/wave1.list @@ -1,4 +1,4 @@ -# Snel wave 1, rome +# Wave 1, rome OpenFOAM-13-GCCcore-15.2.0.eb --hooks=/sw/hooks/openfoam.py ParaView-6.0.0-GCCcore-15.2.0.eb diff --git a/tests/stack_shard_sources.rs b/tests/stack_shard_sources.rs index 11b3aae4..70bf26af 100644 --- a/tests/stack_shard_sources.rs +++ b/tests/stack_shard_sources.rs @@ -187,7 +187,7 @@ fn listing(dir: &Path) -> Vec { fn root_line(f: &Fixture) -> String { format!( - "Root-1.0-GCCcore-15.2.0.eb --from-commit={} --include-systems=snel-zen2\nPlain-1.0-GCCcore-15.2.0.eb\n", + "Root-1.0-GCCcore-15.2.0.eb --from-commit={} --include-systems=site-zen2\nPlain-1.0-GCCcore-15.2.0.eb\n", f.sha ) } @@ -452,7 +452,7 @@ fn materialize_writes_the_selected_commit_files_and_executable_lists() { assert_eq!( local, format!( - "{}/Root-1.0-GCCcore-15.2.0.eb --include-systems=snel-zen2 --robot-paths={}:{}\n", + "{}/Root-1.0-GCCcore-15.2.0.eb --include-systems=site-zen2 --robot-paths={}:{}\n", abs.display(), f.robot.display(), abs.display()