Fix OS_CLOUD export for image validation 21/62321/1 v0.48.x
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Mon, 18 Nov 2019 17:47:44 +0000 (09:47 -0800)
committerAndrew Grimberg <agrimberg@linuxfoundation.org>
Mon, 18 Nov 2019 18:55:50 +0000 (18:55 +0000)
commit07d9fbd1c27ec993a9be1621e372640f6ca55bb5
tree8b20ab3e423b403650c772cfbd39e7440c566c75
parente1a8dc64cfe10360ebdcadd28806adf800760ce7
Fix OS_CLOUD export for image validation

Change fe2beb15bc9effb5b91ba17b520ab6c167dd6604 introduced a bug where
the CLOUD_CREDENTIAL_ID was being used for the OS_CLOUD export variable.
This was done since the test for multi-cloud image validation had the
credential IDs matching the OS_CLOUD variable. However, most of our
systems have the CLOUD_CREDENTIAL_ID set to the default of 'os-cloud'
and therefore after pulling updating to a global-jjb with that change
would no longer be able to validate images!

We now look for an OS_CLOUD variable in the cloud.cfg file and use it if
it is set, otherwise we default to an OS_CLOUD of 'vex' as we previously
did before change fe2beb15bc9effb5b91ba17b520ab6c167dd6604

Change-Id: I0af763495fa3a7ce2e8c080324abaf5d384e5188
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
(cherry picked from commit 93a86e0271fa5fd4d1280007289e842edc558653)
releasenotes/notes/fix-multi-cloud-validator-dedb41f09bb82a81.yaml [new file with mode: 0644]
shell/jenkins-verify-images.sh