X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fonap-deploy.sh;h=f2faad54cc18f3ffaa01a2b282a9bb3d2700295b;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=284a10158129a92457078f4f19ab686fb756fc57;hpb=aadea7b744bfd18a2944ea079155f311edc58e39;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/onap-deploy.sh b/jjb/cloud-infra/onap-deploy.sh
old mode 100755
new mode 100644
index 284a1015..f2faad54
--- a/jjb/cloud-infra/onap-deploy.sh
+++ b/jjb/cloud-infra/onap-deploy.sh
@@ -22,6 +22,7 @@ set -o errexit
 set -o nounset
 
 cd $WORKSPACE
+/bin/rm -f ../inventory.ini
 echo "Info: Preparing for ONAP deployment"
 
 # checkout given engine version
@@ -32,8 +33,10 @@ fi
 
 # checkout given engine refspec
 if [[ "$ENGINE_REFSPEC" != "master" ]]; then
-  echo "Warning: Checking out $ENGINE_REFSPEC"
-  git fetch -q https://gerrit.nordix.org/infra/engine $ENGINE_REFSPEC && git checkout -q FETCH_HEAD
+  echo "Warning: Checking out engine $ENGINE_REFSPEC"
+  echo "-------------------------------------------------------------------------"
+  git fetch https://gerrit.nordix.org/infra/engine $ENGINE_REFSPEC && git checkout -q FETCH_HEAD
+  echo "-------------------------------------------------------------------------"
 fi
 
 # update scenario version and refspec in engine/envine/var/sdf.yml
@@ -54,12 +57,19 @@ scenario:
         distros:
           - $DISTRO
 EOF
+
+  echo "Info: Temporary SDF content"
+  echo "-------------------------------------------------------------------------"
+  cat $WORKSPACE/engine/var/sdf.yml
+  echo "-------------------------------------------------------------------------"
 fi
 
 echo "Info: Starting K8S cluster creation and ONAP deployment"
 echo "-------------------------------------------------------------------------"
 cd $WORKSPACE
-./deploy.sh -c -r $PROVISIONER_TYPE -u $OPENRC_FILE \
+./engine/deploy.sh -r $PROVISIONER_TYPE -u /tmp/openrc \
   -s $DEPLOY_SCENARIO -e $HEAT_ENVIRONMENT_FILE
 
+cd $WORKSPACE
+/bin/cp /opt/engine/.cache/config/inventory.ini ../inventory.ini
 # vim: set ts=2 sw=2 expandtab: