Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
xci: Enable VM provisioning using bifrost for daily runs
[releng.git]
/
prototypes
/
bifrost
/
scripts
/
test-bifrost-deployment.sh
diff --git
a/prototypes/bifrost/scripts/test-bifrost-deployment.sh
b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
index
914a906
..
3c3b6ba
100755
(executable)
--- a/
prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/
prototypes/bifrost/scripts/test-bifrost-deployment.sh
@@
-18,6
+18,8
@@
ENABLE_VENV="false"
USE_DHCP="false"
USE_VENV="false"
BUILD_IMAGE=true
USE_DHCP="false"
USE_VENV="false"
BUILD_IMAGE=true
+export BAREMETAL_DATA_FILE=${BAREMETAL_DATA_FILE:-'/tmp/baremetal.json'}
+export BIFROST_INVENTORY_SOURCE=${BIFROST_INVENTORY_SOURCE:-'/tmp/baremetal.csv'}
PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600}
# Set defaults for ansible command-line options to drive the different
PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600}
# Set defaults for ansible command-line options to drive the different
@@
-37,7
+39,7
@@
export VM_DOMAIN_TYPE="kvm"
export VM_CPU=${VM_CPU:-4}
export VM_DISK=${VM_DISK:-100}
export VM_DISK_CACHE=${VM_DISK_CACHE:-unsafe}
export VM_CPU=${VM_CPU:-4}
export VM_DISK=${VM_DISK:-100}
export VM_DISK_CACHE=${VM_DISK_CACHE:-unsafe}
-TEST_PLAYBOOK="
test-bifrost-infracloud
.yaml"
+TEST_PLAYBOOK="
opnfv-virtual
.yaml"
USE_INSPECTOR=true
USE_CIRROS=false
TESTING_USER=root
USE_INSPECTOR=true
USE_CIRROS=false
TESTING_USER=root
@@
-50,10
+52,10
@@
INVENTORY_DHCP_STATIC_IP=false
WRITE_INTERFACES_FILE=true
# Set BIFROST_INVENTORY_SOURCE
WRITE_INTERFACES_FILE=true
# Set BIFROST_INVENTORY_SOURCE
-export BIFROST_INVENTORY_SOURCE=/tmp/baremetal.
csv
+export BIFROST_INVENTORY_SOURCE=/tmp/baremetal.
json
# DIB custom elements path
# DIB custom elements path
-export ELEMENTS_PATH=/
usr/share/diskimage-builder/elements:/
opt/puppet-infracloud/files/elements
+export ELEMENTS_PATH=/opt/puppet-infracloud/files/elements
# settings for console access
export DIB_DEV_USER_PWDLESS_SUDO=yes
# settings for console access
export DIB_DEV_USER_PWDLESS_SUDO=yes
@@
-79,6
+81,11
@@
source ${ANSIBLE_INSTALL_ROOT}/ansible/hacking/env-setup
ANSIBLE=$(which ansible-playbook)
set -x -o nounset
ANSIBLE=$(which ansible-playbook)
set -x -o nounset
+logs_on_exit() {
+ $SCRIPT_HOME/collect-test-info.sh
+}
+trap logs_on_exit EXIT
+
# Change working directory
cd $BIFROST_HOME/playbooks
# Change working directory
cd $BIFROST_HOME/playbooks
@@
-102,7
+109,8
@@
${ANSIBLE} -vvvv \
-e test_vm_num_nodes=${TEST_VM_NUM_NODES} \
-e test_vm_memory_size=${VM_MEMORY_SIZE} \
-e enable_venv=${ENABLE_VENV} \
-e test_vm_num_nodes=${TEST_VM_NUM_NODES} \
-e test_vm_memory_size=${VM_MEMORY_SIZE} \
-e enable_venv=${ENABLE_VENV} \
- -e test_vm_domain_type=${VM_DOMAIN_TYPE}
+ -e test_vm_domain_type=${VM_DOMAIN_TYPE} \
+ -e baremetal_json_file=${BAREMETAL_DATA_FILE}
# Execute the installation and VM startup test.
${ANSIBLE} -vvvv \
# Execute the installation and VM startup test.
${ANSIBLE} -vvvv \
@@
-129,6
+137,4
@@
if [ $EXITCODE != 0 ]; then
echo "****************************"
fi
echo "****************************"
fi
-$SCRIPT_HOME/collect-test-info.sh
-
exit $EXITCODE
exit $EXITCODE