Merge pull request #628 from socallinuxexpo/rh/1696709124gomplate

[READY] - golden-tests: migrate to nix check
socallinuxexpo · Oct 18, 2023 · e857c20 · e857c20
2 parents 4699e5e + 5526839
commit e857c20
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 42 deletions.
diff --git a/.github/workflows/openwrt-golden.yml b/.github/workflows/openwrt-golden.yml
diff --git a/.github/workflows/validate-datafiles.yml b/.github/workflows/validate-datafiles.yml
@@ -18,3 +18,4 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix build -L .#checks.x86_64-linux.pytest-facts
       - run: nix build -L .#checks.x86_64-linux.perl-switches
+      - run: nix build -L .#checks.x86_64-linux.openwrt-golden
diff --git a/nix/tests/flake-module.nix b/nix/tests/flake-module.nix
@@ -29,6 +29,16 @@
         make .build-switch-configs 
         touch $out
       '');
+      openwrt-golden = pkgs.runCommand "openwrt-golden"
+        {
+          buildInputs = [ pkgs.diffutils pkgs.gomplate ];
+        } ''
+        cp -r --no-preserve=mode ${pkgs.lib.cleanSource inputs.self}/* .
+        cd tests/unit/openwrt
+        mkdir -p $out/tmp/ar71xx
+        ${pkgs.bash}/bin/bash test.sh -t ar71xx -o $out
+      '';
+
     };
   };
 }
diff --git a/tests/unit/openwrt/test.sh b/tests/unit/openwrt/test.sh
@@ -6,6 +6,7 @@ Simple test for gomplate generated templates
 
 OPTIONS:
   -h      Show this message
+  -o      specify output for temporary generated templates
   -t      Target arch to build
   -u      Update golden templates
 
@@ -17,7 +18,7 @@ EXAMPLES:
 EOF
 }
 
-while getopts "ht:u" OPTION
+while getopts "ho:t:u" OPTION
 do
   case $OPTION in
     u )
@@ -26,6 +27,9 @@ do
     t )
       TARGET=$OPTARG
       ;;
+    o )
+      OUTPUT=$OPTARG
+      ;;
     h )
       usage
       exit 0
@@ -41,16 +45,16 @@ shift $((OPTIND -1))
 TARGET=${TARGET:-'ar71xx'}
 UPDATE=${UPDATE:-0}
 
-TMPLOC="tmp/${TARGET}"
+TMPLOC="${OUTPUT:-.}/tmp/${TARGET}"
 KEYPATH="../../../facts/keys/"
 
 gen_templates(){
   # Export to support ENV datasource
   export TARGET=$TARGET
   export KEYPATH=$KEYPATH
-  gomplate -d openwrt=../../../facts/secrets/${TARGET}-openwrt-example.yaml -d keys_dir=${KEYPATH} --input-dir=../../../openwrt/files --output-dir="./${1}"
+  gomplate -d openwrt=../../../facts/secrets/${TARGET}-openwrt-example.yaml -d keys_dir=${KEYPATH} --input-dir=../../../openwrt/files --output-dir="${1}"
   if [ -d ../../../openwrt/files-${TARGET} ]; then
-    gomplate -d openwrt=../../../facts/secrets/${TARGET}-openwrt-example.yaml -d keys_dir=${KEYPATH} --input-dir=../../../openwrt/files-${TARGET} --output-dir="./${1}"
+    gomplate -d openwrt=../../../facts/secrets/${TARGET}-openwrt-example.yaml -d keys_dir=${KEYPATH} --input-dir=../../../openwrt/files-${TARGET} --output-dir="${1}"
   fi
 }
 
@@ -59,6 +63,6 @@ if [ ${UPDATE} -eq 1 ]; then
   gen_templates "golden/${TARGET}"
 fi
 
-gen_templates $TMPLOC
+gen_templates "$TMPLOC"
 
 diff -u -r "golden/${TARGET}" $TMPLOC/