Cherry pick: Merge branch 'slb/dperez50/fix-azure-pipeline' into 'master'

Slb/dperez50/fix azure pipeline

See merge request !464 (merged)

(cherry picked from commit 365dea4f)

77b8379f ci: updating conditions and logic f6fe8799 ci: updating conditions and logic d8f5669a ci: updating conditions and logic 2378d45f ci: updating conditions and logic d69672c9 ci: updating conditions and logic b2f42f57 ci: updating conditions and logic 17c9e24e ci: updating conditions and logic 5948c6e7 ci: updating conditions and logic