Unverified Commit 6d5e7f30 by Cory Lee Committed by GitHub

Coryleeio/fix analytics jenkins role (#4374)

* Updating analytics jenkins role to work again, and to be more consistent with current codebase patterns

* Updating analytics jenkins role to work again, and to be more consistent with current codebase patterns. Moved jenkins.j2 to the directory with other j2 templates
parent 15e67eeb
...@@ -4,5 +4,10 @@ ...@@ -4,5 +4,10 @@
hosts: all hosts: all
become: True become: True
roles: roles:
- jenkins_analytics - role: jenkins_analytics
- nginx ansible_ssh_user: ubuntu
- role: nginx
nginx_sites:
- jenkins
nginx_default_sites:
- jenkins
...@@ -293,4 +293,5 @@ jenkins_analytics_plugins: ...@@ -293,4 +293,5 @@ jenkins_analytics_plugins:
- { name: "translation", version: "1.12" } - { name: "translation", version: "1.12" }
- { name: "violations", version: "0.7.11" } - { name: "violations", version: "0.7.11" }
- { name: "windows-slaves", version: "1.0" } - { name: "windows-slaves", version: "1.0" }
- { name: "workflow-step-api", version: "1.14.2" }
- { name: "xunit", version: "1.93"} - { name: "xunit", version: "1.93"}
...@@ -249,23 +249,6 @@ ...@@ -249,23 +249,6 @@
- install:base - install:base
- install:plugins - install:plugins
- name: Setup nginx vhost
template:
src: "etc/nginx/sites-available/jenkins.j2"
dest: "{{ nginx_sites_available_dir }}/jenkins"
tags:
- install
- install:vhosts
- name: Enable jenkins vhost
file:
src: "{{ nginx_sites_available_dir }}/jenkins"
dest: "{{ nginx_sites_enabled_dir }}/jenkins"
state: link
tags:
- install
- install:vhosts
- include: datadog.yml - include: datadog.yml
when: COMMON_ENABLE_DATADOG when: COMMON_ENABLE_DATADOG
tags: tags:
......
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