From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 2 Mar 2021 18:08:49 +0000 (-0500)
Subject: ceph-dev-new-build: cleanup root-owned mingw64 pbuilder environment
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9b5edf1801d6eef55a90dfbaf0ba36f28bf1c2c7;p=ceph-build.git

ceph-dev-new-build: cleanup root-owned mingw64 pbuilder environment

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/ceph-dev-new-build/build/build_mingw b/ceph-dev-new-build/build/build_mingw
index 23b96803..b26c0255 100644
--- a/ceph-dev-new-build/build/build_mingw
+++ b/ceph-dev-new-build/build/build_mingw
@@ -54,5 +54,8 @@ EOF
     echo Check the status of the repo at: https://shaman.ceph.com/api/repos/${chacra_repo_endpoint}/
 fi
 
+# pbuilder will leave root-owned files in shared workspaces
+sudo chown -R jenkins-build ${WORKSPACE}/dist
+
 # update shaman with the completed build status
 update_build_status "completed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
index 723e9895..f534140a 100644
--- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
+++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
@@ -71,7 +71,7 @@
     builders:
       - shell: |
           echo "Cleaning up top-level workarea (shared among workspaces)"
-          rm -rf dist
+          sudo rm -rf dist
           rm -rf venv
           rm -rf release
       - copyartifact: