commit 86551c75d9b8c9ed25e28d1d67c0b460c5251a9c
author Paul Sokolovsky <paul.sokolovsky@linaro.org> Wed Sep 07 22:14:46 2022 +0300
committer Paul Sokolovsky <paul.sokolovsky@linaro.org> Wed Sep 07 22:15:27 2022 +0300
tree 76698c2578ebbcf7c693e0acfcbb28b65ef35c5a
parent 1c5e93ef2831c62817a0598d9c6e460c18a74e92

Merge pfalcon_templates.yml into docker_templates_amd64.yml

Moving towards production setup.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I1c3240d7e411791258c92ca9642370ded9814812

docker_templates_amd64.yml

diff --git a/docker_templates_amd64.yml b/docker_templates_amd64.yml
index a7d486c..f58d56f 100644
--- a/docker_templates_amd64.yml
+++ b/docker_templates_amd64.yml
@@ -84,3 +84,12 @@
   ssh: !include docker_ssh_buildslave.yml
   volumes: !include mbed_tls_host_docker_vol.yml
   max_instances: '20'
+
+- docker-amd64-eclair:
+  docker_image_name: '987685672616.dkr.ecr.us-east-1.amazonaws.com/misra:eclair-linaro-tfa'
+  labels: 'docker-tf-a-eclair'
+  launch_method: 'launch_ssh'
+  ssh: !include docker_ssh_buildslave.yml
+  volumes: '/data/shared:/srv/shared:rw'
+  # Should match number of detachable licenses in the ECLAIR license server pool.
+  max_instances: '5'

hosts

diff --git a/hosts b/hosts
index b17cd25..5c10d65 100644
--- a/hosts
+++ b/hosts
@@ -6,6 +6,5 @@
   docker_url: tcp://51.159.20.54:2375
   host_credentials_id: docker-access
   max_containers: 30
-  docker_templates:
-    !include [docker_templates_amd64.yml, pfalcon_templates.yml]
+  docker_templates: !include docker_templates_amd64.yml
 

pfalcon_templates.yml

diff --git a/pfalcon_templates.yml b/pfalcon_templates.yml
deleted file mode 100644
index cc58017..0000000
--- a/pfalcon_templates.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- pfalcon-priv:
-  docker_image_name: '987685672616.dkr.ecr.us-east-1.amazonaws.com/misra:eclair-linaro-tfa'
-  labels: 'docker-tf-a-eclair'
-  launch_method: 'launch_ssh'
-  ssh: !include docker_ssh_buildslave.yml
-  volumes: '/data/shared:/srv/shared:rw'
-  # Should match number of detachable licenses in the ECLAIR license server pool.
-  max_instances: '5'