diff options
| author | Chris Evich <cevich@redhat.com> | 2020-10-20 12:01:13 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-11-04 09:40:38 -0500 |
| commit | 46498331a3ed6778664389e3a3c4cf5b0f658c66 (patch) | |
| tree | 3eeb3d072a0b19b79ae48b643400365074299be7 /contrib/cirrus/setup_environment.sh | |
| parent | 55a1aecc741391335795ff46283bb08a20710b2e (diff) | |
| download | podman-46498331a3ed6778664389e3a3c4cf5b0f658c66.tar.gz podman-46498331a3ed6778664389e3a3c4cf5b0f658c66.tar.bz2 podman-46498331a3ed6778664389e3a3c4cf5b0f658c66.zip | |
Cirrus: Use F33beta VM image
Includes disk-space increase for all Fedora images to accommodate
the static-build job disk space requirements. This job substantially
leverages task-cache, which was previously failing to restore early on
in the Cirrus-CI task setup, due to disk-space limitations.
Also simplify .cirrus.yml slightly by removing an unncessary setup
and run directory change step.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 8ccbd95d9..da175cc05 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -99,11 +99,12 @@ fi case "$OS_RELEASE_ID" in ubuntu*) ;; fedora*) - if ((CONTAINER==0)); then # Not yet running inside a container + if ((CONTAINER==0)); then msg "Configuring / Expanding host storage." # VM is setup to allow flexibility in testing alternate storage. # For general use, simply make use of all available space. - ooe.sh bash "$SCRIPT_BASE/add_second_partition.sh" + bash "$SCRIPT_BASE/add_second_partition.sh" + $SCRIPT_BASE/logcollector.sh df # All SELinux distros need this for systemd-in-a-container msg "Enabling container_manage_cgroup" @@ -215,4 +216,4 @@ echo -e "\n# End of global variable definitions" \ >> /etc/ci_environment msg "Global CI Environment vars.:" -cat /etc/ci_environment | sort | indent +grep -Ev '^#' /etc/ci_environment | sort | indent |