containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Fix missing removal of packaged podman 

This was originally intended, but somehow omitted from #1936

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2019-07-09 12:06:51 -04:00
parent 6f3e7f7ecc
commit 9043b816d4
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/cirrus/check_image.sh
View File

@ -16,7 +16,9 @@ MIN_MEM_MB=2000
read JUNK TOTAL USED MEM_FREE JUNK <<<$(free -tm | tail -1) read JUNK TOTAL USED MEM_FREE JUNK <<<$(free -tm | tail -1)
item_test 'Minimum available memory' $MEM_FREE -ge $MIN_MEM_MB || let "RET+=1" item_test 'Minimum available memory' $MEM_FREE -ge $MIN_MEM_MB || let "RET+=1"
item_test "podman command NOT found on path" -z "$(type -P podman)" || let "RET+=1" # We're testing a custom-built podman; make sure there isn't a distro-provided
# binary anywhere; that could potentially taint our results.
item_test "remove_packaged_podman_files() did it's job" -z "$(type -P podman)" || let "RET+=1"
MIN_ZIP_VER='3.0' MIN_ZIP_VER='3.0'
VER_RE='.+([[:digit:]]+\.[[:digit:]]+).+' VER_RE='.+([[:digit:]]+\.[[:digit:]]+).+'

9
contrib/cirrus/lib.sh
View File

@ -323,8 +323,15 @@ install_test_configs(){
/etc/containers/registries.conf /etc/containers/registries.conf
} }
# Remove all files (except conmon, for now) provided by the distro version of podman.
# Except conmon, for now as it's expected to eventually be packaged separately.
# All VM cache-images used for testing include the distro podman because (1) it's
# required for podman-in-podman testing and (2) it somewhat simplifies the task
# of pulling in necessary prerequisites packages as the set can change over time.
# For general CI testing however, calling this function makes sure the system
# can only run the compiled source version.
remove_packaged_podman_files(){ remove_packaged_podman_files(){
show_and_store_warning "Removing packaged podman files to prevent conflicts with source build and testing." echo "Removing packaged podman files to prevent conflicts with source build and testing."
req_env_var OS_RELEASE_ID req_env_var OS_RELEASE_ID
if [[ "$OS_RELEASE_ID" =~ "ubuntu" ]] if [[ "$OS_RELEASE_ID" =~ "ubuntu" ]]
then then

6
contrib/cirrus/setup_environment.sh
View File

@ -52,7 +52,9 @@ install_test_configs
make install.tools make install.tools
case "$SPECIALMODE" in case "$SPECIALMODE" in
none) ;; # Do the normal thing none)
remove_packaged_podman_files # we're building from source
;;
rootless) rootless)
# Only do this once, even if ROOTLESS_USER (somehow) changes # Only do this once, even if ROOTLESS_USER (somehow) changes
if ! grep -q 'ROOTLESS_USER' /etc/environment if ! grep -q 'ROOTLESS_USER' /etc/environment
@ -65,9 +67,9 @@ case "$SPECIALMODE" in
tee -a /etc/environment) && eval "$X" && echo "$X" tee -a /etc/environment) && eval "$X" && echo "$X"
setup_rootless setup_rootless
fi fi
remove_packaged_podman_files
;; ;;
in_podman) # Assumed to be Fedora in_podman) # Assumed to be Fedora
dnf install -y podman
$SCRIPT_BASE/setup_container_environment.sh $SCRIPT_BASE/setup_container_environment.sh
;; ;;
windows) ;& # for podman-remote building only windows) ;& # for podman-remote building only