From 8d7fdc7d79e4de3e3ff5bb50e157d49a0bf8971e Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 7 Nov 2018 09:12:15 -0500 Subject: Cirrus: Use Makefile for image-building The packer tool takes JSON as input for the details of producing VM images to be used for PR CI-testing. JSON is not a very human-friendly format, without support for comments and frequently containing lots of duplicate data. Fix this by using a Makefile + simple python one-liner to convert from a human-friendly YAML format into packer-native JSON. This allows use of anchors/aliases to reduce duplication, and allows inline comments for easier maintainability. This also allows separating the 'test' action from the 'build' action, for earlier and better syntax problem detection. Lastly, there are some minor ``lib.sh`` and ``integration_test.sh`` updates to support future work, and slightly improve the build and test environments. Signed-off-by: Chris Evich --- contrib/cirrus/packer/.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 contrib/cirrus/packer/.gitignore (limited to 'contrib/cirrus/packer/.gitignore') diff --git a/contrib/cirrus/packer/.gitignore b/contrib/cirrus/packer/.gitignore new file mode 100644 index 000000000..6080c9639 --- /dev/null +++ b/contrib/cirrus/packer/.gitignore @@ -0,0 +1,3 @@ +*json +packer +packer*zip -- cgit v1.2.3-54-g00ecf