Merge pull request #4151 from edx/youngstrom/jenkins_common_simplify_deploy

Add tag for deploying test jenkins to build jenkins

playbooks/edx-east/jenkins_build.yml

@@ -64,5 +64,7 @@
     # e.g. ansible-playbook jenkins_testeng_master.yml -i inventory.ini --tags "splunkonly" -vvvv
     - role: splunkforwarder
       when: COMMON_ENABLE_SPLUNKFORWARDER
-      tags: splunkonly
+      tags:
+        - splunkonly
+        - jenkins:promote-to-production
       become: True

playbooks/roles/jenkins_common/meta/main.yml

@@ -17,5 +17,6 @@ dependencies:
     jenkins_server_name: "{{ JENKINS_SERVER_NAME }}"
     jenkins_port: "{{ jenkins_common_port }}"
     jenkins_protocol_https: "{{ jenkins_common_protocol_https }}"
+    tags: jenkins:promote-to-production
   - role: oraclejdk
     tags: java

playbooks/roles/jenkins_common/tasks/main.yml

@@ -164,11 +164,22 @@
     owner: '{{ jenkins_common_user }}'
     group: '{{ jenkins_common_group }}'
   with_items: '{{ jenkins_common_non_plugin_template_files }}'
+  register: templates_copied
   tags:
     - install
     - install:base
     - install:jenkins-configuration
 
+- name: Update Github OAUTH settings when promoting jenkins instance to production
+  template:
+    src: '{{ role_path }}/templates/config/security.yml.j2'
+    dest: '{{ jenkins_common_config_path }}/security.yml'
+    owner: '{{ jenkins_common_user }}'
+    group: '{{ jenkins_common_group }}'
+  when: '"security" in jenkins_common_non_plugin_template_files and templates_copied is not defined'
+  tags:
+    - jenkins:promote-to-production
+
 - name: Copy plugins.yml config file
   template:
     src: '{{ role_path }}/templates/config/plugins.yml.j2'
@@ -268,3 +279,4 @@
     - manage:start
     - install:plugins
     - install:jenkins-configuration
+    - jenkins:promote-to-production