summaryrefslogtreecommitdiff
path: root/contrib/cirrus/lib.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2018-11-07 09:12:15 -0500
committerChris Evich <cevich@redhat.com>2018-12-06 15:39:18 -0500
commit8d7fdc7d79e4de3e3ff5bb50e157d49a0bf8971e (patch)
tree801185e293def2f3437fedb5313d53c7ff448e5b /contrib/cirrus/lib.sh
parentfb3ceeb385b11efa7952c87698add01bdff01c54 (diff)
downloadpodman-8d7fdc7d79e4de3e3ff5bb50e157d49a0bf8971e.tar.gz
podman-8d7fdc7d79e4de3e3ff5bb50e157d49a0bf8971e.tar.bz2
podman-8d7fdc7d79e4de3e3ff5bb50e157d49a0bf8971e.zip
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 <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/lib.sh')
-rw-r--r--contrib/cirrus/lib.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 04314e5fe..ff5925d5d 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -4,8 +4,8 @@
# to be sourced by other scripts, not called directly.
# Under some contexts these values are not set, make sure they are.
-USER="$(whoami)"
-HOME="$(getent passwd $USER | cut -d : -f 6)"
+export USER="$(whoami)"
+export HOME="$(getent passwd $USER | cut -d : -f 6)"
if ! [[ "$PATH" =~ "/usr/local/bin" ]]
then
export PATH="$PATH:/usr/local/bin"
@@ -274,6 +274,10 @@ _finalize(){
sudo rm -rf /var/lib/cloud/instance?
sudo rm -rf /root/.ssh/*
sudo rm -rf /home/*
+ sudo rm -rf /tmp/*
+ sudo rm -rf /tmp/.??*
+ sync
+ sudo fstrim -av
}
rh_finalize(){