Merge "Use auth id instead of name for airship metal3-jenkins Github"