Merge pull request #1486 from Nordix/fix/htpasswd-PEPPI

🐛 Fix htpasswd command not found
metal3-io · Dec 12, 2023 · 721f73b · 721f73b
2 parents 0b1d7bb + dfc7579
commit 721f73b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/hack/ci-e2e.sh b/hack/ci-e2e.sh
@@ -21,6 +21,7 @@ BMO_E2E_EMULATOR=${BMO_E2E_EMULATOR:-"sushy-tools"}
 "${REPO_ROOT}/hack/e2e/ensure_go.sh"
 export PATH="${PATH}:/usr/local/go/bin"
 "${REPO_ROOT}/hack/e2e/ensure_minikube.sh"
+"${REPO_ROOT}/hack/e2e/ensure_htpasswd.sh"
 # CAPI test framework uses kubectl in the background
 "${REPO_ROOT}/hack/e2e/ensure_kubectl.sh"
 

diff --git a/hack/e2e/ensure_htpasswd.sh b/hack/e2e/ensure_htpasswd.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Check if htpasswd is installed and install it if not
+verify_htpasswd()
+{
+    if ! [ -x "$(command -v htpasswd)" ]; then
+        echo "htpasswd could not be found, installing..."
+        sudo apt-get update
+        sudo apt-get install -y apache2-utils
+    fi
+}
+
+verify_htpasswd