Merge pull request #623 from element-hq/bbz/sort-source-fragments2

Sort source_fragments before assembly to remove the chance of differences being generated on a subsequent run

Author: benbz

newsfragments/623.internal.md

@@ -0,0 +1 @@
+CI: sort list of `source_fragments` in CI values files.

scripts/assemble_ci_values_files_from_fragments.sh

@@ -26,6 +26,7 @@ for values_file in "$values_file_root"/$values_file_prefix-values.yaml "$user_va
     echo "$values_file doesn't have a source_fragments header comment. Skipping"
     continue
   fi
+  source_fragments=$(echo "$source_fragments" | tr " " "\n" | sort | uniq | tr "\n" " " | sed 's/^\s*//' | sed 's/\s*$//')
 
   yq_command='.'
   for fragment_name in ${source_fragments}; do
@@ -62,7 +63,7 @@ for values_file in "$values_file_root"/$values_file_prefix-values.yaml "$user_va
 
   cat << EOF >> "$values_file"
 #
-# source_fragments: $(echo "$source_fragments" | tr " " "\n" | sort | uniq | tr "\n" " " | sed 's/^\s*//' | sed 's/\s*$//')
+# source_fragments: $source_fragments
 # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
 
 EOF