diff options
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/file/aio/configure-opnfvhost.yml | 9 | ||||
| -rw-r--r-- | xci/scenarios/README.rst | 1 | ||||
| -rw-r--r-- | xci/scenarios/k8-nosdn-nofeature/.gitkeep | 0 | ||||
| -rw-r--r-- | xci/scenarios/os-nosdn-nofeature/.gitkeep | 0 | ||||
| -rw-r--r-- | xci/scenarios/os-odl-nofeature/.gitkeep | 0 | ||||
| -rwxr-xr-x | xci/scripts/vm/start-new-vm.sh | 9 |
6 files changed, 15 insertions, 4 deletions
diff --git a/xci/file/aio/configure-opnfvhost.yml b/xci/file/aio/configure-opnfvhost.yml index f25476f9..b60c746b 100644 --- a/xci/file/aio/configure-opnfvhost.yml +++ b/xci/file/aio/configure-opnfvhost.yml @@ -10,6 +10,15 @@ command: "/bin/bash ./scripts/bootstrap-ansible.sh" args: chdir: "{{OPENSTACK_OSA_PATH}}" + - name: Disable AIO tempest + lineinfile: + path: "{{ OPENSTACK_OSA_PATH }}/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2" + regexp: "^{{ item }}.*" + line: "{{ item }}: false" + state: present + with_items: + - "tempest_install" + - "tempest_run" - name: bootstrap opnfv host as aio command: "/bin/bash ./scripts/bootstrap-aio.sh" args: diff --git a/xci/scenarios/README.rst b/xci/scenarios/README.rst new file mode 100644 index 00000000..5d9bdf06 --- /dev/null +++ b/xci/scenarios/README.rst @@ -0,0 +1 @@ +This folder keeps the roles for the generic scenarios. diff --git a/xci/scenarios/k8-nosdn-nofeature/.gitkeep b/xci/scenarios/k8-nosdn-nofeature/.gitkeep new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/xci/scenarios/k8-nosdn-nofeature/.gitkeep diff --git a/xci/scenarios/os-nosdn-nofeature/.gitkeep b/xci/scenarios/os-nosdn-nofeature/.gitkeep new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/xci/scenarios/os-nosdn-nofeature/.gitkeep diff --git a/xci/scenarios/os-odl-nofeature/.gitkeep b/xci/scenarios/os-odl-nofeature/.gitkeep new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/xci/scenarios/os-odl-nofeature/.gitkeep diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh index 9b5cdd8e..a6942746 100755 --- a/xci/scripts/vm/start-new-vm.sh +++ b/xci/scripts/vm/start-new-vm.sh @@ -99,10 +99,10 @@ update_clean_vm_files() { [[ $# -ne 1 ]] && usage && exit 1 -declare -r CPU=host -declare -r NCPUS=24 -declare -r MEMORY=49152 -declare -r DISK=500 +declare -r CPU=${XCI_CPU_TYPE:-host} +declare -r NCPUS=${XCI_NCPUS:-24} +declare -r MEMORY=${XCI_MEMORY_SIZE:-49152} +declare -r DISK=${XCI_DISK_SIZE:-500} declare -r VM_NAME=${1}_xci_vm declare -r OS=${1} declare -r NETWORK="jenkins-test" @@ -306,6 +306,7 @@ do_copy() { --exclude "${VM_NAME}*" \ --exclude "${OS}*" \ --exclude "build.log" \ + --exclude "*.qcow2*" \ -e "$vm_ssh" ${BASE_PATH}/ ${VM_NAME}:~/releng-xci/ } |