Merge pull request #186 from greg-hellings/issue182

Stop messing with the executors

Author: greg-hellings

CHANGELOG

@@ -1,3 +1,7 @@
+v 0.8.5 (10 Oct 2017)
+- Remove management of the executor setting on masters (GH #182)
+- Remove stale, unused repo key that began failing (GH #184)
+
 v 0.8.4 (25 Sep 2017)
 - Bump to linchpin 1.0.4 and Ansible >= 2.3.2 because of syntax errors (GH #176)
 - Capture errors from jenkins-cli.jar more robustly (GH #151)

cinch/group_vars/cent7

@@ -9,10 +9,6 @@ _repositories:
 _download_repositories:
   - https://fedorapeople.org/~semyers/jenkins-rpm/jenkins1651.repo
 
-rpm_key_imports:
-  - key: http://pkg.jenkins-ci.org/redhat-stable/jenkins.io.key
-    validate_certs: true
-
 jenkins_slave_repositories: "{{ _repositories }}"
 jenkins_slave_download_repositories: "{{ _download_repositories }}"
 

cinch/group_vars/rhel7

@@ -1,11 +1,5 @@
 gcc_compat_package: compat-gcc-44
 
-# It is important to import the RPM signing key for the Jenkins repository
-# if you plan to use that repository
-rpm_key_imports:
-  - key: http://pkg.jenkins-ci.org/redhat-stable/jenkins.io.key
-    validate_certs: true
-
 all_repositories:
   latest:
     name: rhel7-latest

cinch/roles/jenkins_master/defaults/main.yml

@@ -245,8 +245,6 @@ firewall_tcp_ports:
   - "22/tcp"
   - "80/tcp"
   - "{{ https_enabled | ternary('443/tcp', omit) }}"
-# The number of build executors available on the Jenkins master
-jenkins_executors: 10
 # This setting affects how the update center downloads plugin metadata
 # http://javadoc.jenkins-ci.org/jenkins/model/DownloadSettings.html
 jenkins_usebrowser: false

cinch/roles/jenkins_master/tasks/post_configure.yml

@@ -15,7 +15,6 @@
   # These scripts are run in the order listed below, so please edit this list
   # using the desired execution order.
   with_items:
-    - script: "{{ lookup('template', role_path + '/templates/set_executors.groovy') }}"
     - script: "{{ lookup('template', role_path + '/templates/set_usebrowser.groovy') }}"
     - script: "{{ lookup('template', role_path + '/templates/set_slaveport.groovy') }}"
     - script: "{{ lookup('template', role_path + '/templates/user.groovy') }}"

cinch/roles/jenkins_master/templates/set_executors.groovy

@@ -3,6 +3,8 @@
   ignore_errors: true
   changed_when: false
   register: service_swarm_status
+  tags:
+    - skip_ansible_lint # systemctl module does not support "status"
 
 # Some shell magic is required here to grab the log output from *only* the last
 # run of the swarm service in systemd.  To do this, we find the last PID that

cinch/roles/jenkins_slave/tasks/check_swarm_systemd.yml

@@ -1,7 +1,9 @@
-# systemd: daemon_reload=yes can be used in Ansible 2.4
+# TODO: systemd: daemon_reload=yes can be used in Ansible 2.4
 - name: reload systemd
   command: systemctl daemon-reload
   when: ansible_service_mgr == 'systemd'
+  tags:
+    - skip_ansible_lint
 
 - name: restart nginx service
   service:

cinch/roles/nginx/handlers/main.yml

@@ -9,7 +9,7 @@
 
 setup(
     name='cinch',
-    version='0.8.4',
+    version='0.8.5',
     description='Cinch continuous integration setup',
     long_description=description,
     url='https://github.com/RedHatQE/cinch',