summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/apex/apex.yml16
-rw-r--r--jjb/apex/scenarios.yaml.hidden8
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml46
-rw-r--r--jjb/compass4nfv/compass-deploy.sh2
-rw-r--r--jjb/daisy4nfv/daisy4nfv-merge-jobs.yml2
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml2
-rwxr-xr-xjjb/dovetail/dovetail-run.sh4
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml6
-rwxr-xr-xjjb/functest/functest-alpine.sh15
-rwxr-xr-xjjb/functest/functest-loop.sh6
-rwxr-xr-xjjb/functest/functest-suite.sh6
-rwxr-xr-xjjb/functest/set-functest-env.sh8
-rw-r--r--jjb/xci/xci-verify-jobs.yml8
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh8
-rw-r--r--modules/opnfv/utils/ovs_logger.py19
-rwxr-xr-xutils/fetch_os_creds.sh10
-rw-r--r--utils/test/reporting/img/euphrates.jpgbin44202 -> 47096 bytes
-rw-r--r--utils/test/reporting/reporting/bottlenecks/reporting-status.py6
-rwxr-xr-xutils/test/reporting/reporting/functest/reporting-status.py6
19 files changed, 102 insertions, 76 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 6bd2248bd..c858b7f65 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -140,9 +140,9 @@
<<: *master
- 'os-odl-sfc-ha':
<<: *master
- - 'os-odl-fdio-dvr-noha':
+ - 'os-odl-fdio_dvr-noha':
<<: *master
- - 'os-odl-fdio-dvr-ha':
+ - 'os-odl-fdio_dvr-ha':
<<: *master
- 'os-nosdn-nofeature-noha':
<<: *euphrates
@@ -182,9 +182,9 @@
<<: *euphrates
- 'os-odl-sfc-ha':
<<: *euphrates
- - 'os-odl-fdio-dvr-noha':
+ - 'os-odl-fdio_dvr-noha':
<<: *euphrates
- - 'os-odl-fdio-dvr-ha':
+ - 'os-odl-fdio_dvr-ha':
<<: *euphrates
platform:
@@ -1809,7 +1809,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-fdio-dvr-noha-baremetal-master'
+ - name: 'apex-os-odl-fdio_dvr-noha-baremetal-master'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1818,7 +1818,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-fdio-dvr-ha-baremetal-master'
+ - name: 'apex-os-odl-fdio_dvr-ha-baremetal-master'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -2008,7 +2008,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-fdio-dvr-noha-baremetal-euphrates'
+ - name: 'apex-os-odl-fdio_dvr-noha-baremetal-euphrates'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -2017,7 +2017,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-fdio-dvr-ha-baremetal-euphrates'
+ - name: 'apex-os-odl-fdio_dvr-ha-baremetal-euphrates'
node-parameters: false
current-parameters: false
predefined-parameters: |
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index e7fe92375..a89aa5de2 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -18,8 +18,8 @@ master:
- 'os-nosdn-kvm_ovs_dpdk-ha'
- 'os-odl-sfc-noha'
- 'os-odl-sfc-ha'
- - 'os-odl-fdio-dvr-noha'
- - 'os-odl-fdio-dvr-ha'
+ - 'os-odl-fdio_dvr-noha'
+ - 'os-odl-fdio_dvr-ha'
euphrates:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
@@ -40,8 +40,8 @@ euphrates:
- 'os-nosdn-kvm_ovs_dpdk-ha'
- 'os-odl-sfc-noha'
- 'os-odl-sfc-ha'
- - 'os-odl-fdio-dvr-noha'
- - 'os-odl-fdio-dvr-ha'
+ - 'os-odl-fdio_dvr-noha'
+ - 'os-odl-fdio_dvr-ha'
danube:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 74a134eda..b107c6520 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -95,7 +95,7 @@
- 'os-odl-sfc-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- - 'os-nosdn-dpdk-ha':
+ - 'os-nosdn-ovs_dpdk-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'k8-nosdn-nofeature-ha':
@@ -116,7 +116,7 @@
- 'os-odl-sfc-noha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- - 'os-nosdn-dpdk-noha':
+ - 'os-nosdn-ovs_dpdk-noha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
@@ -290,6 +290,24 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
+ - conditional-step:
+ condition-kind: and
+ condition-operands:
+ - condition-kind: regex-match
+ regex: os-nosdn-nofeature-ha
+ label: '{scenario}'
+ steps:
+ - trigger-builds:
+ - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: 'compass-deploy-{pod}-daily-{stream}'
@@ -424,7 +442,7 @@
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-dpdk-ha-baremetal-centos-master-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-centos-master-trigger'
triggers:
- timed: ''
- trigger:
@@ -460,7 +478,7 @@
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-dpdk-noha-baremetal-centos-master-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger'
triggers:
- timed: ''
@@ -504,7 +522,7 @@
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-dpdk-ha-huawei-pod7-danube-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-ha-huawei-pod7-danube-trigger'
triggers:
- timed: ''
- trigger:
@@ -540,7 +558,7 @@
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-dpdk-noha-huawei-pod7-danube-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger'
triggers:
- timed: ''
#--------------------
@@ -583,7 +601,7 @@
triggers:
- timed: '0 14 * * *'
- trigger:
- name: 'compass-os-nosdn-dpdk-ha-baremetal-master-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger'
triggers:
- timed: '0 16 * * *'
- trigger:
@@ -619,7 +637,7 @@
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-dpdk-noha-baremetal-master-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger'
triggers:
- timed: ''
@@ -663,7 +681,7 @@
triggers:
- timed: '0 13 * * *'
- trigger:
- name: 'compass-os-nosdn-dpdk-ha-baremetal-euphrates-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger'
triggers:
- timed: '0 9 * * *'
- trigger:
@@ -699,7 +717,7 @@
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-dpdk-noha-baremetal-euphrates-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
triggers:
- timed: ''
@@ -743,7 +761,7 @@
triggers:
- timed: '0 13 * * *'
- trigger:
- name: 'compass-os-nosdn-dpdk-ha-virtual-master-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger'
triggers:
- timed: '0 17 * * *'
- trigger:
@@ -779,7 +797,7 @@
triggers:
- timed: '0 20 * * *'
- trigger:
- name: 'compass-os-nosdn-dpdk-noha-virtual-master-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger'
triggers:
- timed: '0 11 * * *'
@@ -823,7 +841,7 @@
triggers:
- timed: '0 16 * * *'
- trigger:
- name: 'compass-os-nosdn-dpdk-ha-virtual-euphrates-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger'
triggers:
- timed: '0 14 * * *'
- trigger:
@@ -859,6 +877,6 @@
triggers:
- timed: '0 19 * * *'
- trigger:
- name: 'compass-os-nosdn-dpdk-noha-virtual-euphrates-trigger'
+ name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
triggers:
- timed: '0 12 * * *'
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 9d4ae5175..ad069a57c 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -39,7 +39,7 @@ elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then
export NETWORK_CONF_FILE=network_onos.yml
elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then
export NETWORK_CONF_FILE=network_openo.yml
-elif [[ "${DEPLOY_SCENARIO}" =~ "-dpdk" ]]; then
+elif [[ "${DEPLOY_SCENARIO}" =~ "-ovs_dpdk" ]]; then
export NETWORK_CONF_FILE=network_dpdk.yml
else
export NETWORK_CONF_FILE=network.yml
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 23c6c7b1c..5bfac1f37 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -21,7 +21,7 @@
- euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled: true
+ disabled: false
#####################################
# patch merge phases
#####################################
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 1474803e9..94f38b193 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -25,7 +25,7 @@
branch: 'stable/{stream}'
dovetail-branch: master
gs-pathname: '/{stream}'
- docker-tag: 'cvp.0.6.0'
+ docker-tag: 'cvp.0.7.0'
#-----------------------------------
# POD, PLATFORM, AND BRANCH MAPPING
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 1b09cca08..2cbb94766 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -152,8 +152,10 @@ dovetail_home_volume="-v ${DOVETAIL_HOME}:${DOVETAIL_HOME}"
echo "Dovetail: Pulling image opnfv/dovetail:${DOCKER_TAG}"
docker pull opnfv/dovetail:$DOCKER_TAG >$redirect
+env4bgpvpn="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
+
cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \
- ${sshkey} opnfv/dovetail:${DOCKER_TAG} /bin/bash"
+ ${sshkey} ${env4bgpvpn} opnfv/dovetail:${DOCKER_TAG} /bin/bash"
echo "Dovetail: running docker run command: ${cmd}"
${cmd} >${redirect}
sleep 5
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index baf44c5d2..3ca6d05d9 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -562,7 +562,7 @@
- trigger:
name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 10 * * *'
- trigger:
name: 'fuel-os-odl-nofeature-ha-zte-pod1-daily-master-trigger'
triggers:
@@ -834,11 +834,11 @@
- trigger:
name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-danube-trigger'
triggers:
- - timed: '0 2 * * 6'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-daily-danube-trigger'
triggers:
- - timed: '0 2 * * 1,3,5'
+ - timed: ''
- trigger:
name: 'fuel-os-odl-nofeature-ha-zte-pod1-daily-danube-trigger'
triggers:
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index ffd86f876..797f66001 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -12,7 +12,7 @@ run_tiers() {
echo 0 > ${ret_val_file}
for tier in ${tiers[@]}; do
- FUNCTEST_IMAGE=opnfv/functest-${tier}
+ FUNCTEST_IMAGE=opnfv/functest-${tier}:${DOCKER_TAG}
echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
docker pull ${FUNCTEST_IMAGE}>/dev/null
cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
@@ -38,17 +38,17 @@ run_test() {
# Determine which Functest image should be used for the test case
case ${test_name} in
connection_check|api_check|snaps_health_check)
- FUNCTEST_IMAGE=opnfv/functest-healthcheck ;;
+ FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} ;;
vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|fds|snaps_smoke)
- FUNCTEST_IMAGE=opnfv/functest-smoke ;;
+ FUNCTEST_IMAGE=opnfv/functest-smoke:${DOCKER_TAG} ;;
tempest_full_parallel|tempest_custom|rally_full)
- FUNCTEST_IMAGE=opnfv/functest-components ;;
+ FUNCTEST_IMAGE=opnfv/functest-components:${DOCKER_TAG} ;;
cloudify_ims|orchestra_openims|orchestra_clearwaterims|vyos_vrouter)
- FUNCTEST_IMAGE=opnfv/functest-vnf ;;
+ FUNCTEST_IMAGE=opnfv/functest-vnf:${DOCKER_TAG} ;;
promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd)
- FUNCTEST_IMAGE=opnfv/functest-features ;;
+ FUNCTEST_IMAGE=opnfv/functest-features:${DOCKER_TAG} ;;
parser-basics)
- FUNCTEST_IMAGE=opnfv/functest-parser ;;
+ FUNCTEST_IMAGE=opnfv/functest-parser:${DOCKER_TAG} ;;
*)
echo "Unkown test case $test_name"
exit 1
@@ -71,6 +71,7 @@ FUNCTEST_DIR=/home/opnfv/functest
DEPLOY_TYPE=baremetal
[[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt
HOST_ARCH=$(uname -m)
+DOCKER_TAG=${DOCKER_TAG:-latest}
# Prepare OpenStack credentials volume
rc_file=${HOME}/opnfv-openrc.sh
diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh
index 00a5f135b..a590d9f95 100755
--- a/jjb/functest/functest-loop.sh
+++ b/jjb/functest/functest-loop.sh
@@ -2,11 +2,7 @@
set +e
[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
-if [ "$BRANCH" == 'master' ]; then
- cmd="run_tests -t all ${flags}"
-else
- cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}"
-fi
+cmd="run_tests -t all ${flags}"
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh
index 9b7f1356c..469a57726 100755
--- a/jjb/functest/functest-suite.sh
+++ b/jjb/functest/functest-suite.sh
@@ -10,11 +10,7 @@ global_ret_val=0
tests=($(echo $FUNCTEST_SUITE_NAME | tr "," "\n"))
for test in ${tests[@]}; do
- if [ "$BRANCH" == 'master' ]; then
- cmd="run_tests -t $test"
- else
- cmd="python /home/opnfv/repos/functest/functest/ci/run_tests.py -t $test"
- fi
+ cmd="run_tests -t $test"
docker exec $container_id $cmd
let global_ret_val+=$?
done
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index bb79dacbe..b116a8528 100755
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -106,12 +106,6 @@ if [ $(docker ps | grep "${FUNCTEST_IMAGE}:${DOCKER_TAG}" | wc -l) == 0 ]; then
exit 1
fi
-if [ "$BRANCH" == 'master' ]; then
- cmd="prepare_env start"
-else
- cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start"
-fi
-
-
+cmd="prepare_env start"
echo "Executing command inside the docker: ${cmd}"
docker exec ${container_id} ${cmd}
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 35dee62e2..17519aca7 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -26,10 +26,10 @@
notbuilt: true
- opensuse:
disabled: false
- successful: true
- failed: true
- unstable: true
- notbuilt: true
+ successful: false
+ failed: false
+ unstable: false
+ notbuilt: false
#--------------------------------
# type
#--------------------------------
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index 8b3980fbc..5398a3402 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -18,6 +18,10 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
fi
fi
+if [[ "${INSTALLER_TYPE}" == 'fuel' ]]; then
+ sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
+fi
+
if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
rc_file_vol="-v /home/ubuntu/config:/etc/yardstick/admin.conf"
@@ -47,6 +51,10 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-e YARDSTICK_BRANCH=${BRANCH} -e BRANCH=${BRANCH} \
-e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
+if [[ "${INSTALLER_TYPE}" == 'fuel' ]]; then
+ envs+=" -e SSH_KEY=/root/.ssh/mcp.rsa"
+fi
+
# Pull the image with correct tag
DOCKER_REPO='opnfv/yardstick'
if [ "$(uname -m)" = 'aarch64' ]; then
diff --git a/modules/opnfv/utils/ovs_logger.py b/modules/opnfv/utils/ovs_logger.py
index 7777a9a16..eb070e3bd 100644
--- a/modules/opnfv/utils/ovs_logger.py
+++ b/modules/opnfv/utils/ovs_logger.py
@@ -27,11 +27,10 @@ class OVSLogger(object):
if not os.path.exists(dirpath):
os.makedirs(dirpath)
- def __ssh_host(self, ssh_conn, host_prefix='10.20.0'):
+ def __ssh_host(self, ssh_conn):
try:
- _, stdout, _ = ssh_conn.exec_command('hostname -I')
- hosts = stdout.readline().strip().split(' ')
- found_host = [h for h in hosts if h.startswith(host_prefix)][0]
+ _, stdout, _ = ssh_conn.exec_command('hostname')
+ found_host = stdout.readline()
return found_host
except Exception as e:
logger.error(e)
@@ -98,10 +97,18 @@ class OVSLogger(object):
def dump_ovs_logs(self, controller_clients, compute_clients,
related_error=None, timestamp=None):
+ """
+ delete controller_clients argument because
+ that was producing an error in XCI installer.
+
+ For more information see:
+ TODO: https://jira.opnfv.org/browse/RELENG-314
+ """
+ del controller_clients
if timestamp is None:
timestamp = time.strftime("%Y%m%d-%H%M%S")
-
- clients = controller_clients + compute_clients
+ # clients = controller_clients + compute_clients
+ clients = compute_clients
for client in clients:
self.ofctl_dump_flows(client, timestamp=timestamp)
self.vsctl_show(client, timestamp=timestamp)
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 0873a6832..ac7595053 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -167,11 +167,7 @@ elif [ "$installer_type" == "apex" ]; then
sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc.v3 $dest_path
elif [ "$installer_type" == "compass" ]; then
- if [ "${BRANCH}" == "master" ]; then
- sudo docker cp compass-tasks:/opt/openrc $dest_path &> /dev/null
- sudo chown $(whoami):$(whoami) $dest_path
- sudo docker cp compass-tasks:/opt/os_cacert $os_cacert
- else
+ if [ "${BRANCH}" == "stable/danube" ]; then
verify_connectivity $installer_ip
controller_ip=$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \
'mysql -ucompass -pcompass -Dcompass -e"select * from cluster;"' \
@@ -201,6 +197,10 @@ elif [ "$installer_type" == "compass" ]; then
fi
info "public_ip: $public_ip"
swap_to_public $public_ip
+ else
+ sudo docker cp compass-tasks:/opt/openrc $dest_path &> /dev/null
+ sudo chown $(whoami):$(whoami) $dest_path
+ sudo docker cp compass-tasks:/opt/os_cacert $os_cacert
fi
elif [ "$installer_type" == "joid" ]; then
diff --git a/utils/test/reporting/img/euphrates.jpg b/utils/test/reporting/img/euphrates.jpg
index 3625b50cb..3eb490d7c 100644
--- a/utils/test/reporting/img/euphrates.jpg
+++ b/utils/test/reporting/img/euphrates.jpg
Binary files differ
diff --git a/utils/test/reporting/reporting/bottlenecks/reporting-status.py b/utils/test/reporting/reporting/bottlenecks/reporting-status.py
index 8966d0690..225227ac3 100644
--- a/utils/test/reporting/reporting/bottlenecks/reporting-status.py
+++ b/utils/test/reporting/reporting/bottlenecks/reporting-status.py
@@ -37,10 +37,14 @@ for version in VERSIONS:
# For all the installers
for installer in INSTALLERS:
# get scenarios results data
+ if version != 'master':
+ new_version = "stable/{}".format(version)
+ else:
+ new_version = version
scenario_results = rp_utils.getScenarios("bottlenecks",
"posca_factor_ping",
installer,
- version)
+ new_version)
LOGGER.info("scenario_results: %s", scenario_results)
scenario_stats = rp_utils.getScenarioStats(scenario_results)
diff --git a/utils/test/reporting/reporting/functest/reporting-status.py b/utils/test/reporting/reporting/functest/reporting-status.py
index 808c84144..267803e6c 100755
--- a/utils/test/reporting/reporting/functest/reporting-status.py
+++ b/utils/test/reporting/reporting/functest/reporting-status.py
@@ -13,8 +13,8 @@ import time
import jinja2
-import testCase as tc
-import scenarioResult as sr
+import reporting.functest.testCase as tc
+import reporting.functest.scenarioResult as sr
import reporting.utils.reporting_utils as rp_utils
"""
@@ -221,7 +221,7 @@ for version in versions:
LOGGER.debug("No results found")
items[s] = testCases2BeDisplayed
- except Exception:
+ except Exception: # pylint: disable=broad-except
LOGGER.error("Error installer %s, version %s, scenario %s",
installer, version, s)
LOGGER.error("No data available: %s", sys.exc_info()[0])