From b3c6fafa4d43ad64e6e9119fc8a04336a378b252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bojan=20=C4=8Cekrli=C4=87?= <bojan@cekrlic.com>
Date: Fri, 27 Oct 2023 12:39:06 +0200
Subject: [PATCH] Fix: Fix integration tests with the new sasl-build script

---
 .github/workflows/master.yml     |  3 ---
 build-scripts/postfix-install.sh |  2 +-
 build-scripts/sasl-build.sh      | 13 ++++---------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 8735acb..9d2da93 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -57,7 +57,6 @@ jobs:
     needs:
       - Unit_Tests
       - Integration_Tests
-      - Helm_chart_Tests
     steps:
       # Checkout
       - name: Checkout
@@ -111,7 +110,6 @@ jobs:
     needs:
       - Unit_Tests
       - Integration_Tests
-      - Helm_chart_Tests
     steps:
       # Checkout
       - name: Checkout
@@ -156,7 +154,6 @@ jobs:
     needs:
       - Unit_Tests
       - Integration_Tests
-      - Helm_chart_Tests
     steps:
       # Checkout
       - name: Checkout
diff --git a/build-scripts/postfix-install.sh b/build-scripts/postfix-install.sh
index 68140e2..70a17d9 100644
--- a/build-scripts/postfix-install.sh
+++ b/build-scripts/postfix-install.sh
@@ -15,7 +15,7 @@ do_alpine() {
 
 do_ubuntu() {
     RELEASE_SPECIFIC_PACKAGES="netcat"
-    if [ "${ID}" -eq "debian" ]; then
+    if [ "${ID}" = "debian" ]; then
         RELEASE_SPECIFIC_PACKAGES="netcat-openbsd"
     fi
     export DEBIAN_FRONTEND=noninteractive
diff --git a/build-scripts/sasl-build.sh b/build-scripts/sasl-build.sh
index ed6413e..f540ca7 100644
--- a/build-scripts/sasl-build.sh
+++ b/build-scripts/sasl-build.sh
@@ -2,21 +2,16 @@
 set -e
 
 build_pandoc() {
-    CAN_INSTALL=1
     if [ -f /etc/alpine-release ]; then
-        if ! apk add --upgrade pandoc; then
-            CAN_INSTALL=0
+        if apk add --upgrade pandoc; then
+            return
         fi
     else
-        if ! apt-get install -y --no-install-recommends; then
-            CAN_INSTALL=0
+        if apt-get install -y --no-install-recommends pandoc; then
+            return
         fi
     fi
 
-    if [ "${CAN_INSTALL}" -eq "1" ; then
-        return
-    fi
-
     if [ -f /etc/alpine-release ]; then
         apk add --upgrade cabal curl llvm
     else