diff options
| author | Benjamin Copeland <ben.copeland@linaro.org> | 2022-10-06 17:44:35 +0100 |
|---|---|---|
| committer | Benjamin Copeland <ben.copeland@linaro.org> | 2022-12-14 10:14:08 +0000 |
| commit | 255ebbdc0a9a8b129476de3a7abc308a0296dd9f (patch) | |
| tree | 9f9a8f3a945e23c6d98a79dfac50e2eef6c6a4e4 | |
| parent | 30969dd0ac9b0792fe4ca0a9df69c442feb0fe5d (diff) | |
Bookworm: Add bookworm to swarm list
Bookworm should be supported in swarm list, also cuttlefish no longer
needs to be on a dedicated agent and such let move it back to swarm
Change-Id: I11f6f7c2177aed288b0bf69836191ac34178e9a3
Signed-off-by: Benjamin Copeland <ben.copeland@linaro.org>
Reviewed-on: https://review.linaro.org/c/infrastructure/ci-yadp-builder/+/42830
| -rw-r--r-- | docker_templates_amd64.yml | 7 | ||||
| -rw-r--r-- | docker_templates_amd64_cuttlefish.yml | 14 | ||||
| -rw-r--r-- | hosts | 2 |
3 files changed, 8 insertions, 15 deletions
diff --git a/docker_templates_amd64.yml b/docker_templates_amd64.yml index 0b72c1c..100eb02 100644 --- a/docker_templates_amd64.yml +++ b/docker_templates_amd64.yml @@ -32,6 +32,13 @@ launch_method: 'launch_ssh' ssh: !include docker_ssh_buildslave.yml +- docker-bookworm: + docker_image_name: 'linaro/jenkins-amd64-debian:bookworm' + labels: 'docker-bookworm docker-bookworm-amd64' + volumes: !include docker_vol_x86_64.yml + launch_method: 'launch_ssh' + ssh: !include docker_ssh_buildslave.yml + - bionic-amd64: docker_image_name: 'linaro/jenkins-amd64-ubuntu:bionic' labels: 'docker-bionic docker-bionic-amd64' diff --git a/docker_templates_amd64_cuttlefish.yml b/docker_templates_amd64_cuttlefish.yml deleted file mode 100644 index 31a668c..0000000 --- a/docker_templates_amd64_cuttlefish.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- docker-bullseye: - docker_image_name: 'linaro/jenkins-amd64-debian:bullseye' - labels: 'docker-bullseye-cuttlefish-amd64' - 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 @@ -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_amd64_cuttlefish.yml] + docker_templates: !include [docker_templates_art_amd64.yml, docker_templates_amd64_android_lkft.yml] # 192.168.36.x runs in Cambridge Lab - aosp-x86_64-11: # ART RPB |