From 8671eb8d0e9cc307c258cef756f2020a7ca01f07 Mon Sep 17 00:00:00 2001
From: Jamil Bou Kheir <jamil@elbii.com>
Date: Mon, 9 Aug 2021 14:09:21 -0700
Subject: [PATCH] Install package after provision to test

---
 .ci/functional_test.sh        | 6 +++---
 .ci/provision/centos_7.sh     | 2 ++
 .ci/provision/centos_8.sh     | 2 ++
 .ci/provision/debian_10.sh    | 2 ++
 .ci/provision/fedora_33.sh    | 2 ++
 .ci/provision/fedora_34.sh    | 2 ++
 .ci/provision/ubuntu_18.04.sh | 2 ++
 .ci/provision/ubuntu_20.04.sh | 2 ++
 8 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.ci/functional_test.sh b/.ci/functional_test.sh
index 487e0150e..e2e1c1f8d 100755
--- a/.ci/functional_test.sh
+++ b/.ci/functional_test.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-set -x
+set -ex
 
 # PORT is set in Github Actions matrix
 
 echo "Trying to load homepage"
-curl -i -vvv -k https://$(hostname):${PORT}/
+curl -i -vvv -k https://$(hostname):${PORT}/ || true
 
 echo "Printing SSL debug info"
-openssl s_client -connect $(hostname):${PORT} -servername $(hostname) -showcerts -prexit
+openssl s_client -connect $(hostname):${PORT} -servername $(hostname) -showcerts -prexit || true
diff --git a/.ci/provision/centos_7.sh b/.ci/provision/centos_7.sh
index d7c7d0940..822ee797c 100755
--- a/.ci/provision/centos_7.sh
+++ b/.ci/provision/centos_7.sh
@@ -59,3 +59,5 @@ bundle install --binstubs
 sudo mkdir -p /opt/firezone
 sudo chown -R ${USER} /opt/firezone
 bin/omnibus build firezone
+
+sudo rpm -i pkg/firezone*.rpm
diff --git a/.ci/provision/centos_8.sh b/.ci/provision/centos_8.sh
index c37c11016..85968981d 100755
--- a/.ci/provision/centos_8.sh
+++ b/.ci/provision/centos_8.sh
@@ -55,3 +55,5 @@ bundle install --binstubs
 sudo mkdir -p /opt/firezone
 sudo chown -R ${USER} /opt/firezone
 bin/omnibus build firezone
+
+sudo rpm -i pkg/firezone*.rpm
diff --git a/.ci/provision/debian_10.sh b/.ci/provision/debian_10.sh
index 426855998..e4d49293f 100755
--- a/.ci/provision/debian_10.sh
+++ b/.ci/provision/debian_10.sh
@@ -74,3 +74,5 @@ bundle install --binstubs
 sudo mkdir -p /opt/firezone
 sudo chown -R ${USER} /opt/firezone
 bin/omnibus build firezone
+
+sudo dpkg -i pkg/firezone*.deb
diff --git a/.ci/provision/fedora_33.sh b/.ci/provision/fedora_33.sh
index bf4b7d8b5..61a5e5257 100755
--- a/.ci/provision/fedora_33.sh
+++ b/.ci/provision/fedora_33.sh
@@ -54,3 +54,5 @@ bundle install --binstubs
 sudo mkdir -p /opt/firezone
 sudo chown -R ${USER} /opt/firezone
 bin/omnibus build firezone
+
+sudo rpm -i pkg/firezone*.rpm
diff --git a/.ci/provision/fedora_34.sh b/.ci/provision/fedora_34.sh
index bf4b7d8b5..61a5e5257 100755
--- a/.ci/provision/fedora_34.sh
+++ b/.ci/provision/fedora_34.sh
@@ -54,3 +54,5 @@ bundle install --binstubs
 sudo mkdir -p /opt/firezone
 sudo chown -R ${USER} /opt/firezone
 bin/omnibus build firezone
+
+sudo rpm -i pkg/firezone*.rpm
diff --git a/.ci/provision/ubuntu_18.04.sh b/.ci/provision/ubuntu_18.04.sh
index 1bf58520e..ace4b531c 100755
--- a/.ci/provision/ubuntu_18.04.sh
+++ b/.ci/provision/ubuntu_18.04.sh
@@ -66,3 +66,5 @@ bundle install --binstubs
 sudo mkdir -p /opt/firezone
 sudo chown -R ${USER} /opt/firezone
 bin/omnibus build firezone
+
+sudo dpkg -i pkg/firezone*.deb
diff --git a/.ci/provision/ubuntu_20.04.sh b/.ci/provision/ubuntu_20.04.sh
index a777febec..8fcfb3d05 100755
--- a/.ci/provision/ubuntu_20.04.sh
+++ b/.ci/provision/ubuntu_20.04.sh
@@ -65,3 +65,5 @@ bundle install --binstubs
 sudo mkdir -p /opt/firezone
 sudo chown -R ${USER} /opt/firezone
 bin/omnibus build firezone
+
+sudo dpkg -i pkg/firezone*.deb