From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 29 Aug 2017 18:24:03 +0000 (-0400)
Subject: tcmu-runner: cleanup shaman.repo using bash trap
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F848%2Fhead;p=ceph-build.git

tcmu-runner: cleanup shaman.repo using bash trap

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

diff --git a/tcmu-runner/build/build_rpm b/tcmu-runner/build/build_rpm
index d18e41c5..71aefae5 100644
--- a/tcmu-runner/build/build_rpm
+++ b/tcmu-runner/build/build_rpm
@@ -35,6 +35,11 @@ if [[ "$REPO_FOUND" -eq 0 ]]; then
   exit 1
 fi
 
+function cleanup() {
+  sudo rm -rf /etc/yum.repos.d/shaman.repo || true
+}
+trap cleanup EXIT
+
 # Copy the repo
 sudo cp $WORKSPACE/shaman.repo /etc/yum.repos.d/
 
diff --git a/tcmu-runner/config/definitions/tcmu-runner.yml b/tcmu-runner/config/definitions/tcmu-runner.yml
index c2ce7629..0c0c53f3 100644
--- a/tcmu-runner/config/definitions/tcmu-runner.yml
+++ b/tcmu-runner/config/definitions/tcmu-runner.yml
@@ -100,10 +100,3 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
-
-    publishers:
-      - postbuildscript:
-          script-only-if-succeeded: False
-          script-only-if-failed: False
-          builders:
-            - shell: "sudo rm -f /etc/apt/sources.list.d/shaman.list /etc/yum.repos.d/shaman.repo"