Fix puppet-agent install

The previous declaration where we installed the puppet-agent was after
we revoked sudo access. We need this to be part of the node setup so we
need to move it out of the build run and to the node setup playbooks.

Depends-On: I2fb0301631eb69bd1e37467229bcf3dc4ab532bb
Change-Id: Id68ee1b443a4172d0c1d6d58a04908c52a566623

.zuul.yaml

@@ -1,6 +1,8 @@
 - job:
     name: puppet-openstack-base
     pre-run: playbooks/prepare-node-common
+    vars:
+        use_puppetlabs: False
 
 - job:
     name: puppet-openstack-integration-base
@@ -311,11 +313,27 @@
     name: puppet-openstack-lint
     parent: puppet-openstack-module-base
     run: playbooks/run-lint-tests
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
 
 - job:
     name: puppet-openstack-syntax
     parent: puppet-openstack-module-base
     run: playbooks/run-syntax-tests
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
 
 - job:
     name: puppet-openstack-syntax-3-legacy
@@ -335,6 +353,8 @@
     parent: puppet-openstack-module-base
     run: playbooks/run-build-tests
     files: ^metadata.json$
+    vars:
+      use_puppetlabs: True
 
 - project-template:
     name: puppet-openstack-check-jobs
@@ -355,4 +375,4 @@
     name: openstack/puppet-openstack-integration
     templates:
       - puppet-openstack-check-jobs
-      - puppet-openstack-integration-jobs-all
+      - puppet-openstack-integration-jobs-all

playbooks/prepare-node-common.yaml

@@ -37,4 +37,26 @@
         - libxml2-dev
         - libxslt-dev
         - ruby-dev
-        - zlib1g-dev
+        - zlib1g-dev
+
+    - name: Install puppetlabs puppet-agent
+      shell:
+        cmd: |
+          set -e
+          set -x
+          if [ -f /usr/bin/yum ]; then
+              yum install -y https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm
+              yum install -y puppet-agent
+          elif [ -f /usr/bin/apt-get ]; then
+              wget https://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb -O /tmp/puppet.deb
+              dpkg -i /tmp/puppet.deb
+              apt-get update
+              apt-get install puppet-agent
+              rm -rf /tmp/puppet.deb
+          fi
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+      become: true
+      when:
+        - use_puppetlabs

playbooks/run-build-tests.yaml

@@ -1,29 +1,5 @@
 - hosts: all
   tasks:
-    - shell:
+    - shell: /opt/puppetlabs/bin/puppet module build .
-        cmd: |
+      args:
-          set -e
+        chdir: '{{ zuul.project.src_dir }}'
-          set -x
-          if [ -f /usr/bin/yum ]; then
-              sudo yum install -y https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm
-              sudo yum install -y puppet-agent
-          elif [ -f /usr/bin/apt-get ]; then
-              wget https://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb -O /tmp/puppet.deb
-              sudo dpkg -i /tmp/puppet.deb
-              sudo apt-get update
-              sudo apt-get install puppet-agent
-              rm -rf /tmp/puppet.deb
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cd $ZUUL_PROJECT
-          puppet module build .
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'