Unverified Commit d2417b6b by Stu Young Committed by GitHub

Merge pull request #4675 from edx/estute/jenkins-container-local-security-config

do not copy security config for local jenkins dev
parents ad188848 7c71d5ef
...@@ -173,12 +173,12 @@ ...@@ -173,12 +173,12 @@
- install:base - install:base
- install:jenkins-configuration - install:jenkins-configuration
- name: Copy all init scripts other than oauth for local dev - name: Copy all init scripts other than oauth and security for local dev
command: 'cp {{ jenkins_common_git_home }}/jenkins-configuration/{{ jenkins_common_configuration_src_path }}/{{ item }} {{ jenkins_common_home }}/init.groovy.d/' command: 'cp {{ jenkins_common_git_home }}/jenkins-configuration/{{ jenkins_common_configuration_src_path }}/{{ item }} {{ jenkins_common_home }}/init.groovy.d/'
with_items: '{{ jenkins_common_configuration_scripts }}' with_items: '{{ jenkins_common_configuration_scripts }}'
become: true become: true
become_user: '{{ jenkins_common_user }}' become_user: '{{ jenkins_common_user }}'
when: 'item != "4configureGHOAuth.groovy" and init_scripts_copied is not defined' when: 'item != "4configureGHOAuth.groovy" and item != "4configureSecurity.groovy" and init_scripts_copied is not defined'
tags: tags:
- jenkins:local-dev - jenkins:local-dev
...@@ -212,14 +212,14 @@ ...@@ -212,14 +212,14 @@
- install:base - install:base
- install:jenkins-configuration - install:jenkins-configuration
- name: For local dev, copy any config files other than oauth - name: For local dev, copy any config files other than oauth and security
template: template:
src: '{{ role_path }}/templates/config/{{ item }}.yml.j2' src: '{{ role_path }}/templates/config/{{ item }}.yml.j2'
dest: '{{ jenkins_common_config_path }}/{{ item }}.yml' dest: '{{ jenkins_common_config_path }}/{{ item }}.yml'
owner: '{{ jenkins_common_user }}' owner: '{{ jenkins_common_user }}'
group: '{{ jenkins_common_group }}' group: '{{ jenkins_common_group }}'
with_items: '{{ jenkins_common_non_plugin_template_files }}' with_items: '{{ jenkins_common_non_plugin_template_files }}'
when: 'item != "security" and templates_copied is not defined' when: 'item != "github_oauth" and item != "security" and templates_copied is not defined'
tags: tags:
- jenkins:local-dev - jenkins:local-dev
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment