Merge "Revoke sudo permissions before infra jobs"

modules/openstack_project/files/jenkins_job_builder/config/infra.yaml

@@ -3,6 +3,7 @@
     node: bare-precise
 
     builders:
+      - revoke-sudo
       - gerrit-git-prep
       - shell: "./tools/run-compare-xml.sh openstack-infra config"
 
@@ -15,6 +16,7 @@
     node: bare-precise
 
     builders:
+      - revoke-sudo
       - gerrit-git-prep
       - shell: |
           source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-infra config
@@ -30,6 +32,7 @@
     node: bare-precise
 
     builders:
+      - revoke-sudo
       - gerrit-git-prep
       - docs:
           github-org: openstack-infra
@@ -50,6 +53,7 @@
     node: bare-precise
 
     builders:
+      - revoke-sudo
       - gerrit-git-prep
       - docs:
           github-org: openstack-infra
@@ -65,6 +69,7 @@
     node: bare-precise
 
     builders:
+      - revoke-sudo
       - gerrit-git-prep
       - shell: "tools/check_projects_yaml_alphabetized.sh"
 

modules/openstack_project/files/jenkins_job_builder/config/macros.yaml

@@ -3,6 +3,15 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org"
 
+- builder:
+    name: revoke-sudo
+    builders:
+      - shell: |
+          #!/bin/bash
+          if [ -f /etc/sudoers.d/jenkins-sudo ] ; then
+              sudo rm /etc/sudoers.d/jenkins-sudo
+          fi
+
 - builder:
     name: coverage
     builders: