From 3d559df540da5c7df488287510bdf9c8dcbc6b72 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 3 Dec 2018 15:20:15 -0500
Subject: Cirrus: Use packaged dependencies

Building/installing dependencies from fixed source-version ensures
testing is reliable, but introduces a maintenance burden and
risks testing far outside of a real-world environment.  The
sensible alternative is to install dependencies from distro-packaging
systems.

Install all development and testing dependencies at VM cache-image build
time, to help ensure testing remains stable.  The existing cache-image
build workflow can be utilized at any future time to build/test
with updated packages.

***N/B***: This does not update any dockerfiles used by testing, that is
left up to future efforts.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 contrib/cirrus/setup_environment.sh | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'contrib/cirrus/setup_environment.sh')

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 8fdcf5897..6beecaa6a 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -6,14 +6,15 @@ source $(dirname $0)/lib.sh
 
 req_env_var USER HOME GOSRC SCRIPT_BASE SETUP_MARKER_FILEPATH
 
+show_env_vars
+
 # Ensure this script only executes successfully once and always logs ending timestamp
 [[ ! -e "$SETUP_MARKER_FILEPATH" ]] || exit 0
 exithandler() {
     RET=$?
-    set +e
-    show_env_vars
+    echo "."
     echo "$(basename $0) exit status: $RET"
-    [[ "$RET" -eq "0" ]] && date +%s >> "SETUP_MARKER_FILEPATH"
+    [[ "$RET" -eq "0" ]] && date +%s >> "$SETUP_MARKER_FILEPATH"
 }
 trap exithandler EXIT
 
@@ -31,6 +32,7 @@ done
 #       Anything externally dependent, should be made fixed-in-time by adding to
 #       contrib/cirrus/packer/*_setup.sh to be incorporated into VM cache-images
 #       (see docs).
+cd "${GOSRC}/"
 case "${OS_REL_VER}" in
     ubuntu-18) ;;
     fedora-30) ;;
@@ -42,20 +44,10 @@ case "${OS_REL_VER}" in
     *) bad_os_id_ver ;;
 esac
 
-cd "${GOSRC}/"
 # Reload to incorporate any changes from above
 source "$SCRIPT_BASE/lib.sh"
 
-echo "Installing cni config, policy and registry config"
-req_env_var GOSRC
-sudo install -D -m 755 $GOSRC/cni/87-podman-bridge.conflist \
-                       /etc/cni/net.d/87-podman-bridge.conflist
-sudo install -D -m 755 $GOSRC/test/policy.json \
-                       /etc/containers/policy.json
-sudo install -D -m 755 $GOSRC/test/registries.conf \
-                       /etc/containers/registries.conf
-# cri-o if installed will mess with testing in non-obvious ways
-rm -f /etc/cni/net.d/*cri*
+install_test_configs
 
 make install.tools
 
-- 
cgit v1.2.3-54-g00ecf