summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-03-24 10:28:33 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-03-24 10:32:40 +0100
commit01508737693731742269326d6ae92a17bebea433 (patch)
tree93fbe1c0f92b63907b2425dd168fa37d18890999 /jjb/xci
parent8b15725dc3a5df11bb3f62b054ee5454f4506ba4 (diff)
xci: Merge bifrost provisioning scripts and rename
Jobs are adjusted as well. Change-Id: I0bc5bdda37277053d81d7da394e0156902da817a Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml32
-rwxr-xr-xjjb/xci/bifrost-verify.sh2
-rw-r--r--jjb/xci/xci-daily-jobs.yml37
-rwxr-xr-xjjb/xci/xci-provision.sh2
4 files changed, 61 insertions, 12 deletions
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index 6aea1c4aa..b9798c777 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -53,11 +53,14 @@
# VM defaults
#--------------------------------
- defaults:
- name: vm_defaults
+ name: verify_vm_defaults
+ test-vm-num-nodes: '3'
+ test-vm-node-names: 'xcimaster controller00 compute00'
+ vm-domain-type: 'kvm'
+ vm-cpu: '2'
vm-disk: '30'
+ vm-memory-size: '4096'
vm-disk-cache: 'unsafe'
- vm-memory: '4096'
- vm-cpu: '2'
#--------------------------------
# job templates
@@ -67,7 +70,7 @@
disabled: '{obj:disabled}'
- defaults: vm_defaults
+ defaults: verify_vm_defaults
concurrent: false
@@ -105,18 +108,27 @@
name: DIB_OS_PACKAGES
default: '{dib-os-packages}'
- string:
- name: VM_DISK
- default: '{vm-disk}'
+ name: TEST_VM_NUM_NODES
+ default: '{test-vm-num-nodes}'
- string:
- name: VM_DISK_CACHE
- default: '{vm-disk-cache}'
+ name: TEST_VM_NODE_NAMES
+ default: '{test-vm-node-names}'
- string:
- name: VM_MEMORY
- default: '{vm-memory}'
+ name: VM_DOMAIN_TYPE
+ default: '{vm-domain-type}'
- string:
name: VM_CPU
default: '{vm-cpu}'
- string:
+ name: VM_DISK
+ default: '{vm-disk}'
+ - string:
+ name: VM_MEMORY_SIZE
+ default: '{vm-memory-size}'
+ - string:
+ name: VM_DISK_CACHE
+ default: '{vm-disk-cache}'
+ - string:
name: CLEAN_DIB_IMAGES
default: 'true'
- label:
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 762466825..782a23445 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -117,7 +117,7 @@ sudo -E ./scripts/destroy-env.sh
# provision 3 VMs; xcimaster, controller, and compute
cd /opt/bifrost
-sudo -E ./scripts/test-bifrost-deployment.sh
+sudo -E ./scripts/bifrost-provision.sh
# list the provisioned VMs
cd /opt/bifrost
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index f42f86263..b79f71195 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -60,6 +60,20 @@
dib-os-element: 'opensuse-minimal'
dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
extra-dib-elements: 'openssh-server'
+
+#--------------------------------
+# VM defaults
+#--------------------------------
+- defaults:
+ name: daily_vm_defaults
+ test-vm-num-nodes: '6'
+ test-vm-node-names: 'xcimaster controller00 controller01 controller02 compute00 compute01'
+ vm-domain-type: 'kvm'
+ vm-cpu: '8'
+ vm-disk: '100'
+ vm-memory-size: '16384'
+ vm-disk-cache: 'unsafe'
+
#--------------------------------
# Phases
#--------------------------------
@@ -168,6 +182,8 @@
disabled: '{obj:disabled}'
+ defaults: daily_vm_defaults
+
concurrent: false
properties:
@@ -212,6 +228,27 @@
name: DIB_OS_PACKAGES
default: '{dib-os-packages}'
- string:
+ name: TEST_VM_NUM_NODES
+ default: '{test-vm-num-nodes}'
+ - string:
+ name: TEST_VM_NODE_NAMES
+ default: '{test-vm-node-names}'
+ - string:
+ name: VM_DOMAIN_TYPE
+ default: '{vm-domain-type}'
+ - string:
+ name: VM_CPU
+ default: '{vm-cpu}'
+ - string:
+ name: VM_DISK
+ default: '{vm-disk}'
+ - string:
+ name: VM_MEMORY_SIZE
+ default: '{vm-memory-size}'
+ - string:
+ name: VM_DISK_CACHE
+ default: '{vm-disk-cache}'
+ - string:
name: CLEAN_DIB_IMAGES
default: 'true'
- label:
diff --git a/jjb/xci/xci-provision.sh b/jjb/xci/xci-provision.sh
index a1ba78bf0..ba447aa48 100755
--- a/jjb/xci/xci-provision.sh
+++ b/jjb/xci/xci-provision.sh
@@ -86,7 +86,7 @@ sudo -E ./scripts/destroy-env.sh
# provision 6 VMs; xcimaster, controller00, controller01, controller02, compute00, and compute01
cd /opt/bifrost
-sudo -E ./scripts/osa-bifrost-deployment.sh
+sudo -E ./scripts/bifrost-provision.sh
# list the provisioned VMs
cd /opt/bifrost