summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-05-27 12:20:22 +0200
committerHolger Levsen <holger@layer-acht.org>2017-05-27 12:20:22 +0200
commit8a636667f5bc776c33c4ccc862a60586c06fe181 (patch)
treee84678400f6838559243bce91fcf1807623b2ef5
parenta3b0ba495360ac94ef72482e971bfa5c704825a7 (diff)
downloadjenkins.debian.net-8a636667f5bc776c33c4ccc862a60586c06fe181.tar.xz
Revert "reproducible Debian: add niceness variation (Closes: #863440)"
This reverts commit a3b0ba495360ac94ef72482e971bfa5c704825a7.
-rwxr-xr-xbin/reproducible_build.sh2
-rwxr-xr-xbin/reproducible_common.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 9018ceb6..3442cd02 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -701,7 +701,7 @@ EOF
# remember to change the sudoers setting if you change the following command
# (the 2nd build gets a longer timeout trying to make sure the first build
# aint wasted when then 2nd happens on a highly loaded node)
- sudo timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 12 \
+ sudo timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice \
/usr/bin/unshare --uts -- \
/usr/sbin/pbuilder --build \
--configfile $TMPCFG \
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 9c93d3cf..433b2976 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -404,7 +404,6 @@ write_variation_table() {
write_page "<tr><td>env BUILDUSERNAME</td><td>BUILDUSERNAME=\"pbuilder1\"</td><td>BUILDUSERNAME=\"pbuilder2\"</td></tr>"
write_page "<tr><td>env USER</td><td>USER=\"pbuilder1\"</td><td>USER=\"pbuilder2\"</td></tr>"
write_page "<tr><td>env HOME</td><td>HOME=\"/nonexistent/first-build\"</td><td>HOME=\"/nonexistent/second-build\"</td></tr>"
- write_page "<tr><td>niceness</td><td>10</td><td>12</td></tr>"
write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"