This statement triggers the pipefail
grep ^OS_CLOUD= jenkins-config/clouds/openstack/cattle/cloud.cfg
$ echo $?
1
ISSUE-ID: IT-18352
Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org>
Change-Id: Id71b3b664f5dca98bc4d784b86e8d68cec7fca9e
--- /dev/null
+---
+fixes:
+ - |
+ Fix grep OS_CLOUD terminates jenkins-verify-images.sh if not found.
+echo "Verifying that cloud has a master configuration file"
for cloud in jenkins-config/clouds/openstack/*; do
for cloud in jenkins-config/clouds/openstack/*; do
- echo "Verifying that cloud has a master configuration file"
- # Verify that we have a cloud config file
- if [ -f "$cloud/cloud.cfg" ]; then
- # Get the OS_CLOUD variable from cloud config and export it
- os_cloud=$(grep ^OS_CLOUD= "$cloud/cloud.cfg" | cut -d'=' -f2)
- OS_CLOUD="${os_cloud:-vex}"
- export OS_CLOUD
-
- verify_images "$cloud"
+ if [[ -f $cloud/cloud.cfg ]]; then
+ # Get the OS_CLOUD variable from cloud config
+ if ! os_cloud=$(egrep "^OS_CLOUD=" "$cloud/cloud.cfg" | cut -d'=' -f2); then
+ os_cloud="vex"
+ fi
+ OS_CLOUD=$os_cloud verify_images "$cloud"
else
echo "ERROR: No cloud.cfg for $cloud"
error=true
else
echo "ERROR: No cloud.cfg for $cloud"
error=true