From c3e3fe23c80d386a23a4344933bdc0c942dc5ba8 Mon Sep 17 00:00:00 2001 From: Rihab Banday Date: Wed, 10 Feb 2021 15:08:10 +0100 Subject: [PATCH] Check prerequisites after sourcing env variables Env variables should be set before checking the prerequisites as the check function depends on some env variables. Change-Id: I75a4b08d0ef077154924df37a859fc7638744343 Signed-off-by: Rihab Banday Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/71959 Tested-by: jenkins-ci Reviewed-by: Michael Pedersen --- deploy.sh | 5 ++--- functions.sh | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deploy.sh b/deploy.sh index d817022..def7d95 100755 --- a/deploy.sh +++ b/deploy.sh @@ -23,15 +23,14 @@ export CURRENTPATH # shellcheck source=./functions.sh source "$CURRENTPATH/functions.sh" +# shellcheck source=./deploy.env +source "$CURRENTPATH/deploy.env" # --------------------------------------------------------------------- # check installation and runtime prerequisites # --------------------------------------------------------------------- check_prerequisites -# shellcheck source=./deploy.env -source "$CURRENTPATH/deploy.env" - # --------------------------------------------------------------------- # creates a virtual environment for installation of dependencies # --------------------------------------------------------------------- diff --git a/functions.sh b/functions.sh index 305dcb7..a446acb 100755 --- a/functions.sh +++ b/functions.sh @@ -36,7 +36,6 @@ check_prerequisites() { #------------------------------------------------------------------------------- # Check for DEPLOYMENT type #------------------------------------------------------------------------------- - DEPLOYMENT=${DEPLOYMENT:-full} if ! [[ "$DEPLOYMENT" =~ ^(full|k8s)$ ]]; then error "Unsupported value for DEPLOYMENT ($DEPLOYMENT)" fi -- 2.16.6