diff options
| author |   Rihab Banday <rihab.banday@ericsson.com> | 2021-02-10 15:08:10 +0100 |
|---|---|---|
| committer | Rihab Banday <rihab.banday@ericsson.com> | 2021-03-03 11:04:04 +0000 |
| commit | c3e3fe23c80d386a23a4344933bdc0c942dc5ba8 (patch) | |
| tree | 2aa536abd934a6607533b7048f728cb41fcc6e32 | |
| parent | 3c0a7dbb638b633855658baed38e3b871a5bcac0 (diff) | |
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 <rihab.banday@ericsson.com>
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/71959
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Michael Pedersen <michaelx.pedersen@intel.com>
| -rwxr-xr-x | deploy.sh | 5 | ||||
| -rwxr-xr-x | functions.sh | 1 |
2 files changed, 2 insertions, 4 deletions
@@ -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 |