Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Commit c1cf872

Browse files
committed
CI Jenkinsfile: shorten uid,gid preparing function
Shell ops can be comnibed to same line. Don't use explicit deleteDir() as we deal with dirs deletion anyway in async-workspaces deletion part Signed-off-by: Olev Kartau <olev.kartau@intel.com>
1 parent 2a6a967 commit c1cf872

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

Jenkinsfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,10 @@ def run_proxy_args() {
223223

224224
def build_user_args() {
225225
dir(pwd([tmp:true])+"/.build_user_args") {
226-
// get jenkins user uid/gid
227-
sh "id -u > jenkins_uid"
226+
// get jenkins user uid/gid
227+
sh "id -u > jenkins_uid && id -g > jenkins_gid"
228228
jenkins_uid = readFile("jenkins_uid").trim()
229-
sh "id -g > jenkins_gid"
230229
jenkins_gid = readFile("jenkins_gid").trim()
231-
deleteDir()
232230
}
233231
return "--build-arg uid=${jenkins_uid} --build-arg gid=${jenkins_gid}"
234232
}

0 commit comments

Comments
 (0)