[OS-BUILD PATCH 0/10] CI: script cleanup part3