Pin engine and scenario versions to patch versions

[infra/cicd.git] / jjb / cloud-infra / onap-deploy.sh

diff --git a/jjb/cloud-infra/onap-deploy.sh b/jjb/cloud-infra/onap-deploy.sh
index deaa9ede8edee23aa62b670c6f714dac59d0dda4..7cf0d6d0e6199cedb7b9c31750f3a10e733a1af7 100644 (file)
--- 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
@@ -66,7 +67,9 @@ 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 -c -r $PROVISIONER_TYPE -u $OPENRC_FILE \
   -s $DEPLOY_SCENARIO -e $HEAT_ENVIRONMENT_FILE
 
+cd $WORKSPACE
+/bin/cp $WORKSPACE/.cache/config/inventory.ini ../inventory.ini
 # vim: set ts=2 sw=2 expandtab: