diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/clover/clover-project.yaml | 6 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yaml | 110 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-verify-jobs.yaml | 6 | ||||
| -rw-r--r-- | jjb/dovetail-webportal/dovetail-webportal-project-jobs.yaml | 9 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 145 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 9 | ||||
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 2 |
9 files changed, 180 insertions, 111 deletions
diff --git a/jjb/clover/clover-project.yaml b/jjb/clover/clover-project.yaml index 31eed8f14..e8bb3acbd 100644 --- a/jjb/clover/clover-project.yaml +++ b/jjb/clover/clover-project.yaml @@ -18,7 +18,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml index e5775b2d5..f93575d1f 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yaml +++ b/jjb/compass4nfv/compass-ci-jobs.yaml @@ -13,14 +13,14 @@ gs-pathname: '' ppa-pathname: '/{stream}' disabled: false - openstack-version: pike - fraser: &fraser - stream: fraser + openstack-version: queens + gambia: &gambia + stream: gambia branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' ppa-pathname: '/{stream}' - openstack-version: pike + openstack-version: queens danube: &danube stream: danube branch: 'stable/{stream}' @@ -45,11 +45,11 @@ - baremetal: slave-label: compass-baremetal-branch os-version: 'xenial' - <<: *fraser + <<: *gambia - virtual: slave-label: compass-virtual-branch os-version: 'xenial' - <<: *fraser + <<: *gambia # ------------------------------- # master # ------------------------------- @@ -389,7 +389,7 @@ !include-raw-escape: ./compass-deploy.sh - conditional-step: condition-kind: regex-match - regex: (danube|fraser) + regex: (danube|gambia) label: '{stream}' steps: - shell: @@ -767,98 +767,98 @@ - timed: '' # ------------------- -# ha-baremetal-fraser +# ha-baremetal-gambia # ------------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '0 1 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-openo-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-openo-ha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-os-odl_l3-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '0 21 2-30/2 * *' - trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-os-onos-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-os-ocl-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-baremetal-fraser-trigger' + name: 'compass-os-onos-sfc-ha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-fraser-trigger' + name: 'compass-os-odl_l2-moon-ha-baremetal-gambia-trigger' triggers: - timed: '' # '0 5 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-kvm-ha-baremetal-gambia-trigger' triggers: - timed: '0 13 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-gambia-trigger' triggers: - timed: '0 9 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-k8-nosdn-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '0 5 1-29/2 * *' - trigger: - name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger' + name: 'compass-os-odl-sfc-ha-baremetal-gambia-trigger' triggers: - timed: '0 17 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-bar-ha-baremetal-gambia-trigger' triggers: - timed: '0 21 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger' + name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-gambia-trigger' triggers: - timed: '0 7 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-stor4nfv-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-stor4nfv-ha-baremetal-gambia-trigger' triggers: - timed: '' # --------------------- -# noha-baremetal-fraser +# noha-baremetal-gambia # --------------------- - trigger: - name: 'compass-os-nosdn-kvm-noha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-kvm-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-nofeature-noha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-nofeature-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-noha-baremetal-fraser-trigger' + name: 'compass-os-odl_l3-nofeature-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-noha-baremetal-fraser-trigger' + name: 'compass-os-odl_l2-moon-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl-sfc-noha-baremetal-fraser-trigger' + name: 'compass-os-odl-sfc-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-bar-noha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-bar-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-fraser-trigger' + name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-gambia-trigger' triggers: - timed: '' @@ -959,97 +959,97 @@ - timed: '0 10 2-30/2 * *' # ----------------- -# ha-virtual-fraser +# ha-virtual-gambia # ----------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '0 23 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-openo-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-openo-ha-virtual-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-fraser-trigger' + name: 'compass-os-odl_l3-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '0 22 2-30/2 * *' - trigger: - name: 'compass-os-onos-nofeature-ha-virtual-fraser-trigger' + name: 'compass-os-onos-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-fraser-trigger' + name: 'compass-os-ocl-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-virtual-fraser-trigger' + name: 'compass-os-onos-sfc-ha-virtual-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-fraser-trigger' + name: 'compass-os-odl_l2-moon-ha-virtual-gambia-trigger' triggers: - timed: '0 20 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-kvm-ha-virtual-gambia-trigger' triggers: - timed: '0 16 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-gambia-trigger' triggers: - timed: '0 14 1-29/2 * *' - trigger: - name: 'compass-os-odl-sfc-ha-virtual-fraser-trigger' + name: 'compass-os-odl-sfc-ha-virtual-gambia-trigger' triggers: - timed: '0 18 2-30/2 * *' - trigger: - name: 'compass-k8-nosdn-nofeature-ha-virtual-fraser-trigger' + name: 'compass-k8-nosdn-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '5 1 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-bar-ha-virtual-gambia-trigger' triggers: - timed: '0 19 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger' + name: 'compass-k8-nosdn-stor4nfv-ha-virtual-gambia-trigger' triggers: - timed: '0 15 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-stor4nfv-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-stor4nfv-ha-virtual-gambia-trigger' triggers: - timed: '' # ------------------- -# noha-virtual-fraser +# noha-virtual-gambia # ------------------- - trigger: - name: 'compass-os-nosdn-kvm-noha-virtual-fraser-trigger' + name: 'compass-os-nosdn-kvm-noha-virtual-gambia-trigger' triggers: - timed: '0 15 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-nofeature-noha-virtual-fraser-trigger' + name: 'compass-os-nosdn-nofeature-noha-virtual-gambia-trigger' triggers: - timed: '0 17 2-30/2 * *' - trigger: - name: 'compass-os-odl_l3-nofeature-noha-virtual-fraser-trigger' + name: 'compass-os-odl_l3-nofeature-noha-virtual-gambia-trigger' triggers: - timed: '0 23 1-29/2 * *' - trigger: - name: 'compass-os-odl_l2-moon-noha-virtual-fraser-trigger' + name: 'compass-os-odl_l2-moon-noha-virtual-gambia-trigger' triggers: - timed: '0 21 2-30/2 * *' - trigger: - name: 'compass-os-odl-sfc-noha-virtual-fraser-trigger' + name: 'compass-os-odl-sfc-noha-virtual-gambia-trigger' triggers: - timed: '0 19 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-fraser-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-gambia-trigger' triggers: - timed: '0 12 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-noha-virtual-fraser-trigger' + name: 'compass-os-nosdn-bar-noha-virtual-gambia-trigger' triggers: - timed: '0 12 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-virtual-fraser-trigger' + name: 'compass-k8-nosdn-stor4nfv-noha-virtual-gambia-trigger' triggers: - timed: '0 13 2-30/2 * *' diff --git a/jjb/compass4nfv/compass-project-jobs.yaml b/jjb/compass4nfv/compass-project-jobs.yaml index b85773405..17745a29e 100644 --- a/jjb/compass4nfv/compass-project-jobs.yaml +++ b/jjb/compass4nfv/compass-project-jobs.yaml @@ -20,7 +20,7 @@ gs-pathname: '/{stream}' ppa-pathname: '/{stream}' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' ppa-pathname: '/{stream}' diff --git a/jjb/compass4nfv/compass-verify-jobs.yaml b/jjb/compass4nfv/compass-verify-jobs.yaml index f0cda8273..37e89e3be 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yaml +++ b/jjb/compass4nfv/compass-verify-jobs.yaml @@ -14,14 +14,14 @@ gs-pathname: '' ppa-pathname: '/{stream}' disabled: false - openstack-version: 'pike' + openstack-version: 'queens' branch-type: 'master' - - fraser: + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' ppa-pathname: '/{stream}' disabled: false - openstack-version: 'pike' + openstack-version: 'queens' branch-type: 'master' distro: diff --git a/jjb/dovetail-webportal/dovetail-webportal-project-jobs.yaml b/jjb/dovetail-webportal/dovetail-webportal-project-jobs.yaml index f7d3213c4..a579af6d6 100644 --- a/jjb/dovetail-webportal/dovetail-webportal-project-jobs.yaml +++ b/jjb/dovetail-webportal/dovetail-webportal-project-jobs.yaml @@ -55,7 +55,7 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' builders: - - dovetail-webportal-hello-world + - dovetail-webportal-unit-tests - job-template: name: 'dovetail-webportal-merge-{stream}' @@ -86,16 +86,17 @@ branch-pattern: '**/{branch}' builders: - - dovetail-webportal-hello-world + - dovetail-webportal-unit-tests ################################ # builders for dovetail project ############################### - builder: - name: dovetail-webportal-hello-world + name: dovetail-webportal-unit-tests builders: - shell: | #!/bin/bash set -o errexit + set -o pipefail - echo "hello world" + tox diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 065d20128..5fe3d36bb 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -16,7 +16,7 @@ set -e DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt -DOVETAIL_HOME=${WORKSPACE}/cvp +DOVETAIL_HOME=${WORKSPACE}/ovp [ -d ${DOVETAIL_HOME} ] && sudo rm -rf ${DOVETAIL_HOME} mkdir -p ${DOVETAIL_HOME} @@ -27,13 +27,43 @@ mkdir -p ${DOVETAIL_CONFIG} DOVETAIL_IMAGES=${DOVETAIL_HOME}/images mkdir -p ${DOVETAIL_IMAGES} +OPENRC=${DOVETAIL_CONFIG}/env_config.sh +CACERT=${DOVETAIL_CONFIG}/os_cacert + ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" sshkey="" -# The path of openrc.sh is defined in fetch_os_creds.sh -OPENRC=${DOVETAIL_CONFIG}/env_config.sh -CACERT=${DOVETAIL_CONFIG}/os_cacert -if [[ ${INSTALLER_TYPE} == 'apex' ]]; then + +check_file_exists() { + if [[ -f $1 ]]; then + return 0 + else + return 1 + fi +} + +get_cred_file_with_scripts() { + echo "INFO: clone releng repo..." + releng_repo=${WORKSPACE}/releng + [ -d ${releng_repo} ] && sudo rm -rf ${releng_repo} + git clone https://gerrit.opnfv.org/gerrit/releng ${releng_repo} >/dev/null + + echo "INFO: clone pharos repo..." + pharos_repo=${WORKSPACE}/pharos + [ -d ${pharos_repo} ] && sudo rm -rf ${pharos_repo} + git clone https://git.opnfv.org/pharos ${pharos_repo} >/dev/null + + echo "INFO: SUT branch is $SUT_BRANCH" + echo "INFO: dovetail branch is $BRANCH" + BRANCH_BACKUP=$BRANCH + export BRANCH=$SUT_BRANCH + cmd="${releng_repo}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} -o ${CACERT} >${redirect}" + echo "INFO: cmd is ${cmd}" + ${cmd} + export BRANCH=$BRANCH_BACKUP +} + +get_apex_cred_file() { instack_mac=$(sudo virsh domiflist undercloud | grep default | \ grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'}) @@ -43,54 +73,79 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable fi -elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then - # If production lab then creds may be retrieved dynamically - # creds are on the jumphost, always in the same folder - sudo cp $LAB_CONFIG/admin-openrc $OPENRC - # If dev lab, credentials may not be the default ones, just provide a path to put them into docker - # replace the default one by the customized one provided by jenkins config -fi + get_cred_file_with_scripts +} -releng_repo=${WORKSPACE}/releng -[ -d ${releng_repo} ] && sudo rm -rf ${releng_repo} -git clone https://gerrit.opnfv.org/gerrit/releng ${releng_repo} >/dev/null +get_compass_cred_file() { + get_cred_file_with_scripts +} -pharos_repo=${WORKSPACE}/pharos -[ -d ${pharos_repo} ] && sudo rm -rf ${pharos_repo} -git clone https://git.opnfv.org/pharos ${pharos_repo} >/dev/null +get_fuel_cred_file() { + get_cred_file_with_scripts +} -if [[ ${INSTALLER_TYPE} != 'joid' ]]; then - echo "SUT branch is $SUT_BRANCH" - echo "dovetail branch is $BRANCH" - BRANCH_BACKUP=$BRANCH - export BRANCH=$SUT_BRANCH - ${releng_repo}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} -o ${CACERT} >${redirect} - export BRANCH=$BRANCH_BACKUP -fi +get_joid_cred_file() { + # If production lab then creds may be retrieved dynamically + # creds are on the jumphost, always in the same folder + sudo cp $LAB_CONFIG/admin-openrc $OPENRC +} -if [[ -f $OPENRC ]]; then - echo "INFO: openstack credentials path is $OPENRC" - if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then - if [[ -f ${CACERT} ]]; then - echo "INFO: ${INSTALLER_TYPE} openstack cacert file is ${CACERT}" +change_cred_file_cacert_path() { + check_file_exists ${CACERT} + if [[ $? == 0 ]]; then + echo "INFO: set ${INSTALLER_TYPE} openstack cacert file to be ${CACERT}" + if [[ ${INSTALLER_TYPE} == "compass" ]]; then echo "export OS_CACERT=${CACERT}" >> ${OPENRC} - else - echo "ERROR: Can't find ${INSTALLER_TYPE} openstack cacert file. Please check if it is existing." - sudo ls -al ${DOVETAIL_CONFIG} - exit 1 + elif [[ ${INSTALLER_TYPE} == "fuel" ]]; then + sed -i "s#/etc/ssl/certs/mcp_os_cacert#${CACERT}#g" ${OPENRC} fi + else + echo "ERROR: cannot find file $OPENRC. Please check if it is existing." + sudo ls -al ${DOVETAIL_CONFIG} + exit 1 fi - echo "export EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" >> ${OPENRC} -else - echo "ERROR: cannot find file $OPENRC. Please check if it is existing." - sudo ls -al ${DOVETAIL_CONFIG} - exit 1 -fi +} -if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "fuel" ]]; then - sed -i "s#/etc/ssl/certs/mcp_os_cacert#${CACERT}#g" ${OPENRC} -fi -cat $OPENRC +change_cred_file_ext_net() { + check_file_exists ${OPENRC} + if [[ $? == 0 ]]; then + echo "export EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" >> ${OPENRC} + else + echo "ERROR: cannot find file $OPENRC. Please check if it is existing." + sudo ls -al ${DOVETAIL_CONFIG} + exit 1 + fi +} + +get_cred_file() { + if [[ ${INSTALLER_TYPE} == 'apex' ]]; then + get_apex_cred_file + elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then + get_compass_cred_file + elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then + get_fuel_cred_file + elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then + get_joid_cred_file + fi + + check_file_exists ${OPENRC} + if [[ $? == 0 ]]; then + echo "INFO: original openstack credentials file is" + cat $OPENRC + echo "INFO: change cacert file path in credentials file" + change_cred_file_cacert_path + echo "INFO: set external network in credentials file" + change_cred_file_ext_net + echo "INFO: final openstack credentials file is" + cat $OPENRC + else + echo "ERROR: cannot find file $OPENRC. Please check if it is existing." + sudo ls -al ${DOVETAIL_CONFIG} + exit 1 + fi +} + +get_cred_file # These packages are used for parsing yaml files and decrypting ipmi user and password. sudo pip install shyaml diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 701d4b471..a34f8a435 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -150,6 +150,15 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" fi +if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then + if [[ -n ${IMAGE_PROPERTIES} ]]; then + IMAGE_PROPERTIES="${IMAGE_PROPERTIES}, hw_mem_page_size: large" + else + IMAGE_PROPERTIES="hw_mem_page_size: large" + fi + FLAVOR_EXTRA_SPECS="hw:mem_page_size: large" + envs="${envs} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\" -e FLAVOR_EXTRA_SPECS=\"${FLAVOR_EXTRA_SPECS}\"" +fi volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index 120c57e98..6f1ce39a0 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -338,7 +338,7 @@ echo $var done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \ ansible-playbook -i playbooks/dynamic_inventory.py \ - -i /root/releng-xci/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ + -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ playbooks/prepare-tests.yml ssh root@192.168.122.2 "/root/prepare-tests.sh" echo "---------------------------------------------------------------------------------" diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 5d3f3ced4..610268c28 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -50,7 +50,7 @@ export XCI_VENV=${XCI_PATH}/venv ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; \ while read var; do declare -x \"\${var}\" 2>/dev/null; done < ${XCI_PATH}/.cache/xci.env && \ cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py \ - -i /root/releng-xci/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ + -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ playbooks/prepare-tests.yml" echo "Prepare OPNFV VM for Tests" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/prepare-tests.sh" |