diff options
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-run-suite.sh | 2 | ||||
| -rw-r--r-- | jjb/xci/bifrost-verify-jobs.yml | 8 | ||||
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 15 |
3 files changed, 15 insertions, 10 deletions
diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh index 0e325e115..cdcf0f05a 100644 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ b/jjb/bottlenecks/bottlenecks-run-suite.sh @@ -47,7 +47,7 @@ if [[ $SUITE_NAME == *posca* ]]; then if [[ -f ${OPENRC} ]]; then echo "BOTTLENECKS INFO: openstack credentials path is ${OPENRC}" - if [[ $INSTALLER_TYPE == 'compass' && ${BRANCH} == 'master' ]]; then + if [[ $INSTALLER_TYPE == 'compass' ]]; then echo "BOTTLENECKS INFO: writing ${OS_CACERT} to ${OPENRC}" echo "export OS_CACERT=${OS_CACERT}" >> ${OPENRC} fi diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml index 5f0b6572a..f8d39b2fb 100644 --- a/jjb/xci/bifrost-verify-jobs.yml +++ b/jjb/xci/bifrost-verify-jobs.yml @@ -12,19 +12,19 @@ # ------------------------------- distro: - 'xenial': - disabled: true + disabled: false dib-os-release: 'xenial' dib-os-element: 'ubuntu-minimal' dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl' extra-dib-elements: 'openssh-server' - 'centos7': - disabled: true + disabled: false dib-os-release: '7' dib-os-element: 'centos-minimal' dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl' extra-dib-elements: 'openssh-server' - - 'suse': - disabled: true + - 'opensuse423': + disabled: false dib-os-release: '42.3' dib-os-element: 'opensuse-minimal' dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl' diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index ef0730938..a86ba91c3 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -25,19 +25,24 @@ cd $WORKSPACE/releng-xci cat > bifrost_test.sh<<EOF cd ~/bifrost # provision 3 VMs; xcimaster, controller, and compute -cd $WORKSPACE/bifrost ./scripts/bifrost-provision.sh # list the provisioned VMs -cd $WORKSPACE/bifrost source env-vars ironic node-list sudo -H -E virsh list EOF chmod a+x bifrost_test.sh -./xci/scripts/vm/start-new-vm.sh $DISTRO +# Fix up distros +case ${DISTRO} in + xenial) VM_DISTRO=ubuntu ;; + centos7) VM_DISTRO=centos ;; + *suse*) VM_DISTRO=opensuse ;; +esac -rsync -a $WORKSPACE/bifrost ${DISTRO,,}_xci_vm:~/bifrost +./xci/scripts/vm/start-new-vm.sh $VM_DISTRO -ssh ${DISTRO,,}_xci_vm "cd ~/bifrost && ./bifrost_test.sh" +rsync -a $WORKSPACE/releng-xci ${VM_DISTRO}_xci_vm:~/bifrost + +ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost && ./bifrost_test.sh" |