From 6a919971cef56b9102dc358014006985d7eaba5b Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Thu, 28 Sep 2017 18:29:54 -0700 Subject: Add support to configuration values In order to make more flexible the execution workflow of this project, a new mechanism has been implemented to override the default configuration values. Change-Id: Ie6c5aeeb35b7f0de47379ea764ccc8dc21e4bff7 Signed-off-by: Victor Morales Issue-Id: INT-236 --- bootstrap/vagrant-onap/tools/Run.ps1 | 21 ++++++++++++++++++++- bootstrap/vagrant-onap/tools/run.sh | 12 +++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) (limited to 'bootstrap/vagrant-onap/tools') diff --git a/bootstrap/vagrant-onap/tools/Run.ps1 b/bootstrap/vagrant-onap/tools/Run.ps1 index 8e6c94fa7..71e595bd8 100644 --- a/bootstrap/vagrant-onap/tools/Run.ps1 +++ b/bootstrap/vagrant-onap/tools/Run.ps1 @@ -20,6 +20,12 @@ Test case to use in testing mode. .PARAMETER y Skips warning prompt. +.PARAMETER g +Skips creation or retrieve image process. + +.PARAMETER i +Skips installation service process. + .LINK https://wiki.onap.org/display/DW/ONAP+on+Vagrant #> @@ -44,7 +50,17 @@ Param( [Parameter(Mandatory=$False,HelpMessage="Skips warning prompt.")] [AllowNull()] [Switch] - $y = $false + $y = $True +, + [Parameter(Mandatory=$False,HelpMessage="Skips creation or retrieve image process.")] + [AllowNull()] + [Switch] + $skip_get_images = $True +, + [Parameter(Mandatory=$False,HelpMessage="Skips warning prompt.")] + [AllowNull()] + [Switch] + $skip_install = $True ) if ( -Not "testing".Equals($Command) ) @@ -63,6 +79,9 @@ if ( -Not "testing".Equals($Command) ) } } +$env:SKIP_GET_IMAGES=$skip_get_images +$env:SKIP_INSTALL=$skip_install + switch ($Command) { "all_in_one" { $env:DEPLOY_MODE="all-in-one" } diff --git a/bootstrap/vagrant-onap/tools/run.sh b/bootstrap/vagrant-onap/tools/run.sh index 08eae01e3..9e03384f7 100755 --- a/bootstrap/vagrant-onap/tools/run.sh +++ b/bootstrap/vagrant-onap/tools/run.sh @@ -6,6 +6,10 @@ Usage: run.sh Command [-y] [-?] Optional arguments: -y Skips warning prompt. + -g + Skips creation or retrieve image process. + -i + Skips installation service process. -s Test suite to use in testing mode. -c @@ -23,11 +27,17 @@ test_case="*" COMMAND=$1 -while getopts "ys:c:" OPTION "${@:2}"; do +while getopts "ygis:c:" OPTION "${@:2}"; do case "$OPTION" in y) run=true ;; + g) + export SKIP_GET_IMAGES="True" + ;; + i) + export SKIP_INSTALL="True" + ;; s) if [ "$COMMAND" != "testing" ] ; then echo "Test suite should only be specified in testing mode." -- cgit 1.2.3-korg