diff options
| -rw-r--r-- | jjb/barometer/barometer.yml | 4 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 21 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-project-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/functest/xtesting-docker.yml | 3 | ||||
| -rw-r--r-- | jjb/functest/xtesting-project-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 3 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 18 | ||||
| -rwxr-xr-x | jjb/xci/xci-set-scenario.sh | 18 |
9 files changed, 40 insertions, 37 deletions
diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml index a8d314a75..92176207f 100644 --- a/jjb/barometer/barometer.yml +++ b/jjb/barometer/barometer.yml @@ -22,10 +22,6 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - euphrates: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - job-template: name: 'barometer-verify-{stream}' diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 72b94bd18..440b00af9 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -28,13 +28,8 @@ check_os_deployment() { run_tiers() { tiers=$1 - if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then - cmd_opt="prepare_env start && run_tests -r -t all" - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all" - else - cmd_opt="run_tests -r -t all" - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all" - fi + cmd_opt="run_tests -r -t all" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -58,11 +53,7 @@ run_tiers() { run_test() { test_name=$1 - if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then - cmd_opt="prepare_env start && run_tests -t ${test_name}" - else - cmd_opt="run_tests -t ${test_name}" - fi + cmd_opt="run_tests -t ${test_name}" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} # Determine which Functest image should be used for the test case @@ -115,11 +106,7 @@ elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" fi -if [[ ${BRANCH} == "stable/euphrates" ]]; then - rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/openstack.creds" -else - rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" -fi +rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" # Set iptables rule to allow forwarding return traffic for container if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then diff --git a/jjb/functest/functest-kubernetes-project-jobs.yml b/jjb/functest/functest-kubernetes-project-jobs.yml index 55999060a..7f8dd8d53 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yml +++ b/jjb/functest/functest-kubernetes-project-jobs.yml @@ -18,11 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 3adf8808c..4468da778 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/functest/xtesting-docker.yml b/jjb/functest/xtesting-docker.yml index dc26344e3..251c3954e 100644 --- a/jjb/functest/xtesting-docker.yml +++ b/jjb/functest/xtesting-docker.yml @@ -12,6 +12,9 @@ - master: branch: '{stream}' disabled: false + - fraser: + branch: 'stable/{stream}' + disabled: false arch_tag: - 'amd64': diff --git a/jjb/functest/xtesting-project-jobs.yml b/jjb/functest/xtesting-project-jobs.yml index bf08775b6..e109387c6 100644 --- a/jjb/functest/xtesting-project-jobs.yml +++ b/jjb/functest/xtesting-project-jobs.yml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index 9d524bcb0..c810212e3 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -27,6 +27,9 @@ set -o nounset set -o pipefail cd ~/bifrost +# set path for XCI repository +export XCI_PATH=~/bifrost/releng-xci + # provision 3 VMs; xcimaster, controller, and compute ./scripts/bifrost-provision.sh | ts diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 7fb0be9b9..6d43c9789 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -47,13 +47,27 @@ fi export XCI_PATH=/home/devuser/releng-xci export XCI_VENV=${XCI_PATH}/venv -ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; source ${XCI_PATH}/.cache/xci.env && cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml" +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 installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml" echo "Running functest" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh" # Record exit code functest_exit=$? + +case ${DEPLOY_SCENARIO[0]} in + os-*) + FUNCTEST_LOG=/root/results/functest.log + ;; + k8-*) + FUNCTEST_LOG=/root/results/functest-kubernetes.log + ;; + *) + echo "Unable to determine the installer. Exiting!" + exit 1 + ;; +esac + echo "Functest log" echo "---------------------------------------------------------------------------------" -ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat /root/results/functest.log" +ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat $FUNCTEST_LOG" echo "---------------------------------------------------------------------------------" exit ${functest_exit} diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh index b591dd23c..c28093d27 100755 --- a/jjb/xci/xci-set-scenario.sh +++ b/jjb/xci/xci-set-scenario.sh @@ -96,22 +96,26 @@ function determine_generic_scenario() { # get the changeset cd $WORKSPACE SCENARIOS=$(git diff HEAD^..HEAD --name-only -- 'xci/scenarios' | cut -d "/" -f 3 | uniq) - # We need to set default scenario for changes that do not mess with scenarios - NO_SCENARIOS=$(git diff HEAD^..HEAD --name-only | grep -v 'xci/scenarios' | cut -d "/" -f 3 | uniq) + # We need to set default scenario for changes that mess with installers + INSTALLERS=$(git diff HEAD^..HEAD --name-only -- 'xci/installer' | cut -d "/" -f 3 | uniq) for CHANGED_SCENARIO in $SCENARIOS; do - [[ ${DEPLOY_SCENARIO[@]} =~ $CHANGED_SCENARIO ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO + DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO done - for CHANGED_FILE in $NO_SCENARIOS; do - case $CHANGED_FILE in + for CHANGED_INSTALLER in $INSTALLERS; do + case $CHANGED_INSTALLER in kubespray) - [[ ${DEPLOY_SCENARIO[@]} =~ "k8-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature' + DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature' ;; # Default case (including OSA changes) *) - [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature' + DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature' ;; esac done + # For all other changes, we only need to set a default scenario if it's not set already + if git diff HEAD^..HEAD --name-only | grep -q -v 'xci/installer\|xci/scenario'; then + [[ ${#DEPLOY_SCENARIO[@]} -eq 0 ]] && DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature' + fi # extract releng-xci sha XCI_SHA=$(cd $WORKSPACE && git rev-parse HEAD) |