diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/fetch_os_creds.sh | 9 | ||||
| -rw-r--r-- | utils/push-test-logs.sh | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index c240976d8..34c81af1a 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -80,9 +80,16 @@ if [ "$installer_type" == "fuel" ]; then #ip_fuel="10.20.0.2" verify_connectivity $installer_ip + env=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \ + 'fuel env'|grep operational|tail -1|awk '{print $1}') &> /dev/null + if [ -z $env ]; then + error "No operational environment detected in Fuel" + fi + env_id="${FUEL_ENV:-$env}" + # Check if controller is alive (online='True') controller_ip=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \ - 'fuel node | grep controller | grep "True\| 1" | awk -F\| "{print \$5}" | tail -1' | \ + 'fuel node --env ${env_id} | grep controller | grep "True\| 1" | awk -F\| "{print \$5}" | tail -1' | \ sed 's/ //g') &> /dev/null if [ -z $controller_ip ]; then diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index b385fa88a..d36561d2d 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -54,7 +54,7 @@ if [ -d "$dir_result" ]; then echo "Not possible to push results to artifact: gsutil not installed."; else echo "copy result files to artifact $project_artifact" - gsutil -m cp -r "$dir_result" gs://artifacts.opnfv.org/"$project_artifact"/ + gsutil -m cp -r "$dir_result" gs://artifacts.opnfv.org/"$project_artifact"/ >/dev/null 2>&1 fi fi else |