Merge "Changes deploy to use frozen Arno release versions for Foreman related tools"

diff --git a/foreman/ci/bootstrap.sh b/foreman/ci/bootstrap.sh
index 839dfaa..4bc22ed 100755 (executable)
--- a/foreman/ci/bootstrap.sh
+++ b/foreman/ci/bootstrap.sh
@@ -36,7 +36,7 @@ cd /opt
 echo "Cloning khaleesi to /opt"
 
 if [ ! -d khaleesi ]; then
-  if ! git clone -b opnfv https://github.com/trozet/khaleesi.git; then
+  if ! git clone -b v1.0 https://github.com/trozet/khaleesi.git; then
     printf '%s\n' 'bootstrap.sh: Unable to git clone khaleesi' >&2
     exit 1
   fi

diff --git a/foreman/ci/deploy.sh b/foreman/ci/deploy.sh
index 77024c6..86f03a7 100755 (executable)
--- a/foreman/ci/deploy.sh
+++ b/foreman/ci/deploy.sh
@@ -277,7 +277,7 @@ rm -rf /tmp/bgs_vagrant
 
 ##clone bgs vagrant
 ##will change this to be opnfv repo when commit is done
-if ! git clone https://github.com/trozet/bgs_vagrant.git; then
+if ! git clone -b v1.0 https://github.com/trozet/bgs_vagrant.git; then
   printf '%s\n' 'deploy.sh: Unable to clone vagrant repo' >&2
   exit 1
 fi
@@ -567,7 +567,7 @@ for node in ${nodes}; do
 
   ##clone bgs vagrant
   ##will change this to be opnfv repo when commit is done
-  if ! git clone https://github.com/trozet/bgs_vagrant.git $node; then
+  if ! git clone -b v1.0 https://github.com/trozet/bgs_vagrant.git $node; then
     printf '%s\n' 'deploy.sh: Unable to clone vagrant repo' >&2
     exit 1
   fi