From 8a82d3a452bc41946e0b7b54663d25d0e1b8efb1 Mon Sep 17 00:00:00 2001 From: Ben Copeland Date: Tue, 5 Dec 2017 16:22:49 +0000 Subject: Jenkins: No longer underscore _ as this breaks Ansible in certian situations Change-Id: I9d5acc69a4090bbd88d422cc76e5aba5e4754e9c Reviewed-on: https://review.linaro.org/22831 Reviewed-by: Benjamin Copeland --- group_vars/jenkins-master | 42 ------------------------------------ group_vars/jenkins-slaves | 21 ------------------ group_vars/jenkins_master | 42 ++++++++++++++++++++++++++++++++++++ group_vars/jenkins_slaves | 21 ++++++++++++++++++ hosts | 4 ++-- jenkins-master.yml | 2 +- jenkins-slaves.yml | 4 ++-- roles/ssh-ldap/templates/sshd_config | 2 +- 8 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 group_vars/jenkins-master delete mode 100644 group_vars/jenkins-slaves create mode 100644 group_vars/jenkins_master create mode 100644 group_vars/jenkins_slaves diff --git a/group_vars/jenkins-master b/group_vars/jenkins-master deleted file mode 100644 index 3027bcc1..00000000 --- a/group_vars/jenkins-master +++ /dev/null @@ -1,42 +0,0 @@ - -# Apache -hostname: "{{inventory_hostname}}" -apache_user: www-data -apache_modules: - - ssl - - proxy - - proxy_http - - rewrite -ssl_cert: /etc/letsencrypt/live/{{hostname}}/fullchain.pem -ssl_key: /etc/letsencrypt/live/{{hostname}}/privkey.pem - -# Docker -jenkins_master_image: 'linaro/ci-x86_64-jenkins-master-debian:lts' -jenkins_master_container_name: 'jenkins' -jenkins_master_data_container_name: 'jenkins_data' -jenkins_master_data_volume: '/srv/jenkins' - -jenkins_master_port: '8080' -jenkins_master_slaves_port: '2233' -jenkins_master_sshd_port: '2222' -jenkins_jnlp_port: '50000' - -jenkins_slave_image: 'jenkins_slave' - -# LDAP -ldap_cache_url: "" - -login_groups: - - systems - - team-builds-and-baselines - -ldap_base: dc=linaro,dc=org -ldap_uri: "ldaps://login.linaro.org" -ldap_binddn: cn=ldapbind,dc=linaro,dc=org - -# SUDO - -sudo_groups: - - systems - - users - diff --git a/group_vars/jenkins-slaves b/group_vars/jenkins-slaves deleted file mode 100644 index ab4d8042..00000000 --- a/group_vars/jenkins-slaves +++ /dev/null @@ -1,21 +0,0 @@ -login_groups: - - systems - - team-builds-and-baselines - - buildslave - - ssh_access_jenkins_slaves - -sudo_groups: - - systems - - team-builds-and-baselines - -ldap_base: dc=linaro,dc=org -ldap_uri: "ldaps://login.linaro.org" -ldap_binddn: cn=ldapbind,dc=linaro,dc=org - -ldap_cache_url: "" - -docker_engine_opts: - - "--dns 8.8.8.8 --dns 8.8.4.4" - - "-H tcp://0.0.0.0:2375" - - "-H unix:///var/run/docker.sock" - - "--storage-driver=overlay2" diff --git a/group_vars/jenkins_master b/group_vars/jenkins_master new file mode 100644 index 00000000..3027bcc1 --- /dev/null +++ b/group_vars/jenkins_master @@ -0,0 +1,42 @@ + +# Apache +hostname: "{{inventory_hostname}}" +apache_user: www-data +apache_modules: + - ssl + - proxy + - proxy_http + - rewrite +ssl_cert: /etc/letsencrypt/live/{{hostname}}/fullchain.pem +ssl_key: /etc/letsencrypt/live/{{hostname}}/privkey.pem + +# Docker +jenkins_master_image: 'linaro/ci-x86_64-jenkins-master-debian:lts' +jenkins_master_container_name: 'jenkins' +jenkins_master_data_container_name: 'jenkins_data' +jenkins_master_data_volume: '/srv/jenkins' + +jenkins_master_port: '8080' +jenkins_master_slaves_port: '2233' +jenkins_master_sshd_port: '2222' +jenkins_jnlp_port: '50000' + +jenkins_slave_image: 'jenkins_slave' + +# LDAP +ldap_cache_url: "" + +login_groups: + - systems + - team-builds-and-baselines + +ldap_base: dc=linaro,dc=org +ldap_uri: "ldaps://login.linaro.org" +ldap_binddn: cn=ldapbind,dc=linaro,dc=org + +# SUDO + +sudo_groups: + - systems + - users + diff --git a/group_vars/jenkins_slaves b/group_vars/jenkins_slaves new file mode 100644 index 00000000..ab4d8042 --- /dev/null +++ b/group_vars/jenkins_slaves @@ -0,0 +1,21 @@ +login_groups: + - systems + - team-builds-and-baselines + - buildslave + - ssh_access_jenkins_slaves + +sudo_groups: + - systems + - team-builds-and-baselines + +ldap_base: dc=linaro,dc=org +ldap_uri: "ldaps://login.linaro.org" +ldap_binddn: cn=ldapbind,dc=linaro,dc=org + +ldap_cache_url: "" + +docker_engine_opts: + - "--dns 8.8.8.8 --dns 8.8.4.4" + - "-H tcp://0.0.0.0:2375" + - "-H unix:///var/run/docker.sock" + - "--storage-driver=overlay2" diff --git a/hosts b/hosts index 19ab5e66..107568fc 100644 --- a/hosts +++ b/hosts @@ -52,10 +52,10 @@ elk.linaro.org [elk_warm] elk.linaro.org -[jenkins-master] +[jenkins_master] ci.linaro.org -[jenkins-slaves] +[jenkins_slaves] 144.76.6.139 # aosp-x86_64-07 188.40.51.209 # aosp-x86_64-08 213.133.116.86 # aosp-x86_64-09 (ART) diff --git a/jenkins-master.yml b/jenkins-master.yml index 345156db..00a78923 100644 --- a/jenkins-master.yml +++ b/jenkins-master.yml @@ -1,7 +1,7 @@ # Deploy jenkins-master --- - name: Deploy jenkins - hosts: jenkins-master + hosts: jenkins_master become: yes vars_files: - "{{secrets_dir}}/host_vars/{{inventory_hostname}}" diff --git a/jenkins-slaves.yml b/jenkins-slaves.yml index c84962f4..e02cd73c 100644 --- a/jenkins-slaves.yml +++ b/jenkins-slaves.yml @@ -1,8 +1,8 @@ - name: Configure jenkins slaves - hosts: jenkins-slaves + hosts: jenkins_slaves become: yes vars_files: - - ["{{secrets_dir}}/group_vars/jenkins-slaves"] + - ["{{secrets_dir}}/group_vars/jenkins_slaves"] roles: - role: jenkins-slave-deps - role: ssh-ldap diff --git a/roles/ssh-ldap/templates/sshd_config b/roles/ssh-ldap/templates/sshd_config index 09f5fb0a..dd380a6c 100644 --- a/roles/ssh-ldap/templates/sshd_config +++ b/roles/ssh-ldap/templates/sshd_config @@ -49,7 +49,7 @@ PermitEmptyPasswords no # some PAM modules and threads) ChallengeResponseAuthentication no -{%if inventory_hostname not in groups['jenkins-slaves']%} +{%if inventory_hostname not in groups['jenkins_slaves']%} # Password prompt required for legacy buildslave user PasswordAuthentication no {%endif%} -- cgit v1.2.3