diff options
| author | Kelley Spoon <kelley.spoon@linaro.org> | 2023-10-18 14:46:24 -0500 |
|---|---|---|
| committer | Kelley Spoon <kelley.spoon@linaro.org> | 2023-10-18 20:03:42 +0000 |
| commit | e511fc5a817dd08afdcf7617a432760958944a4f (patch) | |
| tree | 097d46b9b1ce985b39ba97fb0a50d2476aa47895 | |
| parent | 33089f0d3849a3b190f1f6e99866981090fcfd09 (diff) | |
aosp-x86-09: add server
This change adds in aosp-x86-09.
It also corrects a potential issue with nfs mounts that weren't
being included on servers under the jenkins_slaves_hetzner ansible
group by merging it with the jenkins_slaves_hetzner_oe group.
Change-Id: I3bab30b7769ed8de0cdb5d7512c9f7731f780853
Signed-off-by: Kelley Spoon <kelley.spoon@linaro.org>
Reviewed-on: https://review.linaro.org/c/infrastructure/ansible-playbooks/+/45954
| -rw-r--r-- | group_vars/jenkins_master | 2 | ||||
| -rw-r--r-- | group_vars/jenkins_slaves_hetzner (renamed from group_vars/jenkins_slaves_hetzner_oe) | 0 | ||||
| -rw-r--r-- | hosts | 7 | ||||
| -rw-r--r-- | jenkins.yml | 2 | ||||
| -rw-r--r-- | ssh/config | 6 | ||||
| -rw-r--r-- | ssh/known_hosts | 1 |
6 files changed, 8 insertions, 10 deletions
diff --git a/group_vars/jenkins_master b/group_vars/jenkins_master index 55a5d49a..f4195183 100644 --- a/group_vars/jenkins_master +++ b/group_vars/jenkins_master @@ -56,7 +56,7 @@ sudo_groups: - systems - users -nfs_client_group: "jenkins_slaves_hetzner_oe" +nfs_client_group: "jenkins_slaves_hetzner" nfs_exports: - name: "buildslave" path: "/var/data/nfs" diff --git a/group_vars/jenkins_slaves_hetzner_oe b/group_vars/jenkins_slaves_hetzner index 1d270553..1d270553 100644 --- a/group_vars/jenkins_slaves_hetzner_oe +++ b/group_vars/jenkins_slaves_hetzner @@ -75,16 +75,16 @@ mbedtls.trustedfirmware.org [jenkins_slaves_hetzner] aosp-x86-07 ansible_host=144.76.6.139 # aosp-x86-07 aosp-x86-08 ansible_host=188.40.51.209 # aosp-x86-08 +aosp-x86-09 ansible_host=49.12.133.85 # aosp-x86-09 +#aosp-x86-10 ansible_host= # aosp-x86-10 aosp-x86-13 ansible_host=95.217.145.175 # aosp-x86-13 (ART) -x86-13 ansible_host=88.99.59.232 # x86-13 (LITE) - -[jenkins_slaves_hetzner_oe] x86-07 ansible_host=188.40.92.79 # x86-07 x86-08 ansible_host=188.40.49.144 # x86-08 x86-09 ansible_host=148.251.184.94 # x86-09 x86-10 ansible_host=138.201.52.83 # x86-10 x86-11 ansible_host=88.99.28.12 # x86-11 (RPB) # triggers x86-12 ansible_host=88.99.28.38 # x86-12 (RPB) +x86-13 ansible_host=88.99.59.232 # x86-13 (LITE) x86-14 ansible_host=88.99.149.141 # x86-14 x86-15 ansible_host=95.216.16.165 # x86-15 @@ -108,7 +108,6 @@ ldcg-aarch64-02 ansible_host=10.40.88.130 ansible_user=ci-admin [jenkins_slaves:children] jenkins_slaves_hetzner -jenkins_slaves_hetzner_oe jenkins_slaves_online jenkins_slaves_online_tf jenkins_slaves_packet diff --git a/jenkins.yml b/jenkins.yml index c766a032..321e66d7 100644 --- a/jenkins.yml +++ b/jenkins.yml @@ -84,8 +84,6 @@ - {role: jenkins-slave-deps, tags: [jenkins]} - {role: nfs-client, tags: [nfs], when: nfs_client_mount is defined} - - { role: filebeat, tags: [filebeat] } - - { role: metricbeat, tags: [metricbeat] } - name: Configure non-ldap jenkins slaves hosts: jenkins_slaves_simple @@ -40,9 +40,9 @@ Host aosp-x86-07 Host aosp-x86-08 Hostname 188.40.51.209 Host aosp-x86-09 - Hostname 213.133.116.86 -Host aosp-x86-10 - Hostname 78.46.190.194 + Hostname 49.12.133.85 +#Host aosp-x86-10 +# Hostname # Note: we don't seem to have access via LDAP here Host aosp-x86-11 Hostname 192.168.36.10 diff --git a/ssh/known_hosts b/ssh/known_hosts index dd5f86f1..70f1668f 100644 --- a/ssh/known_hosts +++ b/ssh/known_hosts @@ -377,3 +377,4 @@ gerrit.devboardsforandroid.ctt.linaro.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO gerrit.devboardsforandroid.linaro.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIASzeLZnFxBsm6XcQrxyLnL+6nSZOarQIxZGlGYSpEfl 51.159.20.61 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqFIMuv7uvRrXi/ZR039oIvKFrWeqXIz1+bG/DW8ghb 51.159.20.82 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOrhC3ObEpimoeJmEQg1SDysiMFgBN3O4OAUFyjiLq1a +49.12.133.85 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMfQywbVNPoQEapesnReQPCSDqgw/yECzmRNAtNhclLt |