Refactoring of CI scripts

Change-Id: I78834f9f9e7e023b2684463897ad05bb77c1122a
Merge "Refactoring of CI scripts"