jenkins-bot has submitted this change and it was merged. Change subject: update delete-stale-branch to use keyholder ......................................................................
update delete-stale-branch to use keyholder Change-Id: Ieff5ac4e2b75232fea27f879891304a1b6f83234 --- M bin/delete-stale-branch 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/delete-stale-branch b/bin/delete-stale-branch index 41c9fbc..d37b901 100755 --- a/bin/delete-stale-branch +++ b/bin/delete-stale-branch @@ -53,7 +53,6 @@ sudo -u l10nupdate rm -rf php-$STALE_VERSION/cache/l10n/* rm -rf php-$STALE_VERSION -git add -u docroot/bits/static/ -git add -u w/static/ -git commit -m "Remove $STALE_VERSION symlinks" -dsh -g mediawiki-installation -M -F 40 -- "sudo -u mwdeploy -- rm -rf /srv/mediawiki/php-$STALE_VERSION" +SSH_AUTH_SOCK=/run/keyholder/proxy.sock dsh -F 20 -M -g scap-masters -r ssh -o -oUser=mwdeploy -- rm -rf /srv/mediawiki/php-$STALE_VERSION +SSH_AUTH_SOCK=/run/keyholder/proxy.sock dsh -F 20 -M -g scap-proxies -r ssh -o -oUser=mwdeploy -- rm -rf /srv/mediawiki/php-$STALE_VERSION +SSH_AUTH_SOCK=/run/keyholder/proxy.sock dsh -F 20 -M -g mediawiki-installation -r ssh -o -oUser=mwdeploy -- rm -rf /srv/mediawiki/php-$STALE_VERSION -- To view, visit https://gerrit.wikimedia.org/r/303913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieff5ac4e2b75232fea27f879891304a1b6f83234 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: 20after4 <[email protected]> Gerrit-Reviewer: Chad <[email protected]> Gerrit-Reviewer: Thcipriani <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
