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 23b968032fb02a008b4c08ee92366468ec717a61..b26c0255382a426327473277d5cab08f9e0471fc 100644 (file)
--- 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 723e9895faf810eeb575699b6f06f4a0371bff1b..f534140a4cdb436d44d7e42e878fbdbc773cfd31 100644 (file)
--- 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: