Merge "CI: deploy-cache STUB: ci/deploy.sh -C arg def" into stable/colorado

1 files changed, 76 insertions, 0 deletions

diff --git a/patches/opnfv-fuel/0056-CI-deploy-cache-STUB-ci-deploy.sh-C-arg-def.patch b/patches/opnfv-fuel/0056-CI-deploy-cache-STUB-ci-deploy.sh-C-arg-def.patch
new file mode 100644
index 00000000..4e5a108c
--- /dev/null
+++ b/patches/opnfv-fuel/0056-CI-deploy-cache-STUB-ci-deploy.sh-C-arg-def.patch
@@ -0,0 +1,76 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 24 Nov 2016 23:02:04 +0100
+Subject: [PATCH] CI: deploy-cache STUB: ci/deploy.sh -C arg def
+
+Prepare support for caching deploy artifacts, like bootstraps and
+target images, which take a lot of time at each deploy to be built,
+considering it requires a cross-debootstrap via qemu-user-static and
+binfmt.
+
+NOTE: THIS IS JUST A STUB. Full implementation will be cherry-picked
+from master after proper testing, but we need to implement arg
+support so we don't break on unknown "-C" arg passed down from Releng.
+
+JIRA: ARMBAND-172
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ ci/deploy.sh | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/ci/deploy.sh b/ci/deploy.sh
+index 081806c..b3dc4dc 100755
+--- a/ci/deploy.sh
++++ b/ci/deploy.sh
+@@ -29,7 +29,7 @@ cat << EOF
+ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ `basename $0`: Deploys the Fuel@OPNFV stack
+
+-usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] [-T timeout] -i iso
++usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] [-C deploy-cache-dir] [-T timeout] -i iso
+        -s deployment-scenario [-S optional Deploy-scenario path URI]
+        [-R optional local relen repo (containing deployment Scenarios]
+
+@@ -47,6 +47,7 @@ OPTIONS:
+   -p  Pod-name
+   -s  Deploy-scenario short-name/base-file-name
+   -S  Storage dir for VM images
++  -C  Deploy cache dir for storing image artifacts
+   -T  Timeout, in minutes, for the deploy.
+   -i  iso url
+
+@@ -79,6 +80,7 @@ Input parameters to the build script is:
+    or a deployment short-name as defined by scenario.yaml in the deployment
+    scenario path.
+ -S Storage dir for VM images, default is fuel/deploy/images
++-C Deploy cache dir for bootstrap and target image artifacts, optional
+ -T Timeout, in minutes, for the deploy. It defaults to using the DEPLOY_TIMEOUT
+    environment variable when defined, or to the default in deploy.py otherwise
+ -i .iso image to be deployed (needs to be provided in a URI
+@@ -116,6 +118,7 @@ FUEL_CREATION_ONLY=''
+ NO_DEPLOY_ENVIRONMENT=''
+ STORAGE_DIR=''
+ DRY_RUN=0
++DEPLOY_CACHE_DIR=''
+ if ! [ -z $DEPLOY_TIMEOUT ]; then
+     DEPLOY_TIMEOUT="-dt $DEPLOY_TIMEOUT"
+ else
+@@ -128,7 +131,7 @@ fi
+ ############################################################################
+ # BEGIN of main
+ #
+-while getopts "b:B:dfFHl:L:p:s:S:T:i:he" OPTION
++while getopts "b:B:dfFHl:L:p:s:S:C:T:i:he" OPTION
+ do
+     case $OPTION in
+         b)
+@@ -179,6 +182,9 @@ do
+                 STORAGE_DIR="-s ${OPTARG}"
+             fi
+             ;;
++        C)
++            DEPLOY_CACHE_DIR="-dc ${OPTARG}"
++            ;;
+         T)
+             DEPLOY_TIMEOUT="-dt ${OPTARG}"
+             ;;