diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2018-09-19 20:40:02 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2018-09-28 13:50:56 +0000 |
| commit | 8c04045615bd35f38351a507a9eac7314d1ecd34 (patch) | |
| tree | baf3fff0fc699c7f0b047d2e8fa5b492260afba0 | |
| parent | 808f8e4eab43e2a5f094ce1139171d0cc877596f (diff) | |
move arm64/armhf builders out of aus-colo
As part of STG-1503 deploy new armhf builder in scaleway
and use packet.net for arm64. This requires splitting out the
templates to arm64 and armhf specific.
Change-Id: I6f32bcb454bf580f229128f7159fbe765a7e6e60
Reviewed-on: https://review.linaro.org/28526
Reviewed-by: Kelley Spoon <kelley.spoon@linaro.org>
Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
| -rw-r--r-- | docker_templates_aarch64.yml | 20 | ||||
| -rw-r--r-- | docker_templates_armhf.yml | 21 | ||||
| -rw-r--r-- | hosts.yml | 38 |
3 files changed, 26 insertions, 53 deletions
diff --git a/docker_templates_aarch64.yml b/docker_templates_aarch64.yml index 35ddc0a..2bbff44 100644 --- a/docker_templates_aarch64.yml +++ b/docker_templates_aarch64.yml @@ -6,13 +6,6 @@ ssh: !include docker_ssh_buildslave.yml volumes: !include docker_vol_x86_64.yml -- xenial-armhf: - docker_image_name: 'linaro/ci-armhf-ubuntu:xenial' - labels: 'docker-xenial-armhf' - launch_method: 'launch_ssh' - ssh: !include docker_ssh_buildslave.yml - volumes: !include docker_vol_x86_64.yml - - jessie-arm64: docker_image_name: 'linaro/ci-arm64-debian:jessie' labels: 'docker-jessie-arm64' @@ -20,13 +13,6 @@ ssh: !include docker_ssh_buildslave.yml volumes: !include docker_vol_x86_64.yml -- jessie-armhf: - docker_image_name: 'linaro/ci-armhf-debian:jessie' - labels: 'docker-jessie-armhf' - launch_method: 'launch_ssh' - ssh: !include docker_ssh_buildslave.yml - volumes: !include docker_vol_x86_64.yml - - stretch-arm64: docker_image_name: 'linaro/ci-arm64-debian:stretch' labels: 'docker-stretch-arm64' @@ -34,9 +20,3 @@ ssh: !include docker_ssh_buildslave.yml volumes: !include docker_vol_x86_64.yml -- stretch-armhf: - docker_image_name: 'linaro/ci-armhf-debian:stretch' - labels: 'docker-stretch-armhf' - launch_method: 'launch_ssh' - ssh: !include docker_ssh_buildslave.yml - volumes: !include docker_vol_x86_64.yml diff --git a/docker_templates_armhf.yml b/docker_templates_armhf.yml new file mode 100644 index 0000000..ecac0fa --- /dev/null +++ b/docker_templates_armhf.yml @@ -0,0 +1,21 @@ +--- +- xenial-armhf: + docker_image_name: 'linaro/ci-armhf-ubuntu:xenial' + labels: 'docker-xenial-armhf' + launch_method: 'launch_ssh' + ssh: !include docker_ssh_buildslave.yml + volumes: !include docker_vol_x86_64.yml + +- jessie-armhf: + docker_image_name: 'linaro/ci-armhf-debian:jessie' + labels: 'docker-jessie-armhf' + launch_method: 'launch_ssh' + ssh: !include docker_ssh_buildslave.yml + volumes: !include docker_vol_x86_64.yml + +- stretch-armhf: + docker_image_name: 'linaro/ci-armhf-debian:stretch' + labels: 'docker-stretch-armhf' + launch_method: 'launch_ssh' + ssh: !include docker_ssh_buildslave.yml + volumes: !include docker_vol_x86_64.yml @@ -1,44 +1,11 @@ --- # List of YADP Hosts -- aarch64-01: - cloud_name: aarch64-01 - docker_url: tcp://10.10.0.215:2375 - docker_templates: !include docker_templates_aarch64.yml - -- aarch64-02: - cloud_name: aarch64-02 - docker_url: tcp://10.10.0.216:2375 - docker_templates: !include docker_templates_aarch64.yml - -- aarch64-03: - cloud_name: aarch64-03 - docker_url: tcp://10.10.0.217:2375 - docker_templates: !include docker_templates_aarch64.yml - -- aarch64-04: - cloud_name: aarch64-04 - docker_url: tcp://10.10.0.219:2375 - docker_templates: !include docker_templates_aarch64.yml - -- aarch64-05: - cloud_name: aarch64-05 - docker_url: tcp://10.10.0.220:2375 - docker_templates: !include docker_templates_aarch64.yml - -# NO aarch64-06 ????? - -- aarch64-07: - cloud_name: aarch64-07 - docker_url: tcp://10.10.0.218:2375 - docker_templates: !include docker_templates_aarch64.yml - - aarch64-08: cloud_name: aarch64-08 docker_url: tcp://147.75.32.78:2375 docker_templates: !include docker_templates_aarch64.yml - - aosp-x86_64-07: cloud_name: aosp-x86_64-07 docker_url: tcp://144.76.6.139:2375 @@ -70,6 +37,11 @@ docker_url: tcp://192.168.36.15:2375 docker_templates: !include docker_templates_art_lab_amd64.yml +- armhf-01: + cloud_name: armhf-01 + docker_url: tcp://51.15.128.165:2375 + docker_templates: !include docker_templates_armhf.yml + - lhg-01: cloud_name: lhg-01 docker_url: tcp://148.251.140.195:2375 |