staging: Update YADP to include per project style docker images
This version doesn't remove docker-amd64-bionic label, so this can
be deployed without waiting for the jobs to have migrated.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Change-Id: Ic5139d17e28fd46469ceadc796f6262b157c167e
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..0ee0ec4
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.trustedfirmware.org
+port=29418
+project=next/ci/ci-yadp-builder
diff --git a/docker_templates_amd64.yml b/docker_templates_amd64.yml
index 06947a1..8fa4e96 100644
--- a/docker_templates_amd64.yml
+++ b/docker_templates_amd64.yml
@@ -9,8 +9,25 @@
- PATH : '/home/buildslave/tools/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
- PLANTUML_JAR_PATH : '/usr/share/plantuml/plantuml.jar'
-- docker-amd64-bionic-hafnium:
- docker_image_name: 'trustedfirmware/ci-amd64-hafnium:bionic'
- labels: 'docker-amd64-hafnium'
+- docker-amd64-tf-m-bionic:
+ docker_image_name: 'trustedfirmware/ci-amd64-tf-m-ubuntu:bionic'
+ labels: 'docker-amd64-tf-m-bionic'
+ launch_method: 'launch_ssh'
+ ssh: !include docker_ssh_buildslave.yml
+ max_instances: '20'
+ environment_variables:
+ - PATH : '/home/buildslave/tools/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+ - PLANTUML_JAR_PATH : '/usr/share/plantuml/plantuml.jar'
+
+- docker-amd64-tf-a-bionic:
+ docker_image_name: 'trustedfirmware/ci-amd64-tf-a-ubuntu:bionic'
+ labels: 'docker-amd64-tf-a-bionic'
+ launch_method: 'launch_ssh'
+ ssh: !include docker_ssh_buildslave.yml
+ max_instances: '50'
+
+- docker-amd64-hafnium-bionic:
+ docker_image_name: 'trustedfirmware/ci-amd64-hafnium-ubuntu:bionic'
+ labels: 'docker-amd64-hafnium-bionic'
launch_method: 'launch_ssh'
ssh: !include docker_ssh_buildslave.yml