aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Copeland <ben.copeland@linaro.org>2022-10-06 17:44:35 +0100
committerBenjamin Copeland <ben.copeland@linaro.org>2022-10-06 17:02:19 +0000
commit30969dd0ac9b0792fe4ca0a9df69c442feb0fe5d (patch)
tree1a79d7494064a86d08378c4a0c5c7200ce4371d5
parent9e123b1dcc0e596684e02f15aed5c52ebe4ac075 (diff)
Cuttlefish: Move job away from -15 and onto aosp worker
We need to run this job outside NFS and on a worker with space. This is a stop gap measure. Change-Id: Ib8df6dd97ee0f634963c4086aab52bf479dfc095 Signed-off-by: Benjamin Copeland <ben.copeland@linaro.org> Reviewed-on: https://review.linaro.org/c/infrastructure/ci-yadp-builder/+/42298 Reviewed-by: Kelley Spoon <kelley.spoon@linaro.org>
-rw-r--r--docker_templates_amd64_cuttlefish.yml9
-rw-r--r--hosts4
2 files changed, 10 insertions, 3 deletions
diff --git a/docker_templates_amd64_cuttlefish.yml b/docker_templates_amd64_cuttlefish.yml
index c75d2b8..31a668c 100644
--- a/docker_templates_amd64_cuttlefish.yml
+++ b/docker_templates_amd64_cuttlefish.yml
@@ -2,6 +2,13 @@
- docker-bullseye:
docker_image_name: 'linaro/jenkins-amd64-debian:bullseye'
labels: 'docker-bullseye-cuttlefish-amd64'
- volumes: !include docker_vol_x86_64.yml
+ volumes:
+ '/srv/docker/ssh/buildslave.config:/home/buildslave/.ssh/config:ro
+\n/etc/ssh/ssh_known_hosts:/etc/ssh/ssh_known_hosts:ro
+\n/srv/docker/ssh/buildslave.known_hosts:/home/buildslave/.ssh/known_hosts:ro
+\n/srv/docker/ssh/id_rsa_buildslave.pub:/home/buildslave/.ssh/authorized_keys:ro
+\n/var/lib/libvirt:/var/lib/libvirt:rw
+\n/dev/bus/usb:/dev/bus/usb:ro
+\n'
launch_method: 'launch_ssh'
ssh: !include docker_ssh_buildslave.yml
diff --git a/hosts b/hosts
index 457f9f1..d834b34 100644
--- a/hosts
+++ b/hosts
@@ -24,7 +24,7 @@
cloud_name: aosp-x86_64-13
docker_url: tcp://95.217.145.175:2375
host_credentials_id: docker-access
- docker_templates: !include [docker_templates_art_amd64.yml, docker_templates_amd64_android_lkft.yml]
+ docker_templates: !include [docker_templates_art_amd64.yml, docker_templates_amd64_android_lkft.yml, docker_templates_amd64_cuttlefish.yml]
# 192.168.36.x runs in Cambridge Lab
- aosp-x86_64-11: # ART RPB
@@ -119,7 +119,7 @@
docker_url: tcp://95.216.16.165:2375
host_credentials_id: docker-access
max_containers: 1
- docker_templates: !include [docker_templates_amd64_android_lkft.yml, docker_templates_amd64_cuttlefish.yml]
+ docker_templates: !include [docker_templates_amd64_android_lkft.yml]
# Not using docker_templates_amd64.yml due to using custom number of
# max_containers/max_instances