Skip to content

Commit 0136c53

Browse files
committed
add EC2 worker resource tags
1 parent 1d34cc8 commit 0136c53

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

configuration/admin/admin.cfg

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ c['workers'].append(worker.EC2LatentWorker(workername, 'sekrit', 'c5.metal',
192192
security_group_ids=[os.environ.get('BUILDBOT_WORKER_SECURITY_GROUP', 'default'),],
193193
subnet_id=os.environ.get('BUILDBOT_WORKER_SUBNET', 'default'),
194194
user_data=init_script.format(sstate_efs_dns_name, workername),
195+
tags={'meta-aws-buildbot': 'clean sstate'},
195196
block_device_map= [
196197
{
197198
"DeviceName": "/dev/xvdf",
@@ -243,6 +244,7 @@ for instance in x86_64_instance_types:
243244
security_group_ids=[os.environ.get('BUILDBOT_WORKER_SECURITY_GROUP', 'default'),],
244245
subnet_id=os.environ.get('BUILDBOT_WORKER_SUBNET', 'default'),
245246
user_data=init_script.format(sstate_efs_dns_name, instance.replace(".", "_")),
247+
tags={'meta-aws-buildbot': 'instance test'},
246248
block_device_map= [
247249
{
248250
"DeviceName": "/dev/xvdf",
@@ -266,6 +268,7 @@ for instance in arm_64_instance_types:
266268
security_group_ids=[os.environ.get('BUILDBOT_WORKER_SECURITY_GROUP', 'default'),],
267269
subnet_id=os.environ.get('BUILDBOT_WORKER_SUBNET', 'default'),
268270
user_data=init_script.format(sstate_efs_dns_name, instance.replace(".", "_")),
271+
tags={'meta-aws-buildbot': 'instance test'},
269272
block_device_map= [
270273
{
271274
"DeviceName": "/dev/xvdf",
@@ -332,6 +335,7 @@ for release in meta_aws_supported_releases:
332335
security_group_ids=[os.environ.get('BUILDBOT_WORKER_SECURITY_GROUP', 'default'),],
333336
subnet_id=os.environ.get('BUILDBOT_WORKER_SUBNET', 'default'),
334337
user_data=init_script.format(sstate_efs_dns_name, workername),
338+
tags={'meta-aws-buildbot': 'meta-aws release tests'},
335339
block_device_map= [
336340
{
337341
"DeviceName": "/dev/xvdf",
@@ -388,6 +392,7 @@ for release in meta_aws_supported_releases:
388392
security_group_ids=[os.environ.get('BUILDBOT_WORKER_SECURITY_GROUP', 'default'),],
389393
subnet_id=os.environ.get('BUILDBOT_WORKER_SUBNET', 'default'),
390394
user_data=init_script.format(sstate_efs_dns_name, workername),
395+
tags={'meta-aws-buildbot': 'meta-aws release tests'},
391396
block_device_map= [
392397
{
393398
"DeviceName": "/dev/xvdf",
@@ -448,7 +453,7 @@ for branch in meta_aws_demos_supported_branches:
448453
set -euxo pipefail;
449454
echo 'ACCEPT_FSL_EULA = \"1\"' >> conf/local.conf ;
450455
echo 'BB_DANGLINGAPPENDS_WARNONLY = \"1\"' >> conf/local.conf ;
451-
for i in \"agl-renesas aws-greengrass-test-image\" \"agl-rpi aws-greengrass-test-image\" \"imx8m aws-greengrass-test-image\" \"phytec aws-greengrass-test-image\" \"qemu-arm64 aws-greengrass-test-image\" \"qemu-x86-64 aws-greengrass-test-image\" \"rpi4-64 aws-greengrass-test-image\" \"rpi4-32 aws-greengrass-test-image\" \"ec2-arm64 aws-greengrass-test-image\" \"ec2-x86-64 aws-greengrass-test-image\" \"ti-am572x-idk aws-greengrass-test-image\";
456+
for i in \"agl-renesas aws-greengrass-test-image\" \"imx8m aws-greengrass-test-image\" \"phytec aws-greengrass-test-image\" \"qemu-arm64 aws-greengrass-test-image\" \"qemu-x86-64 aws-greengrass-test-image\" \"rpi4-64 aws-greengrass-test-image\" \"rpi4-32 aws-greengrass-test-image\" \"ec2-arm64 aws-greengrass-test-image\" \"ec2-x86-64 aws-greengrass-test-image\" \"ti-am572x-idk aws-greengrass-test-image\";
452457
do set -- $i # Convert the "tuple" into the param args $1 $2... ;
453458
echo DEVICE: $1 and IMAGE: $2;
454459
BB_ENV_PASSTHROUGH_ADDITIONS="SSTATE_DIR $BB_ENV_PASSTHROUGH_ADDITIONS" SSTATE_DIR="/sstate" DEVICE=$1 IMAGE=$2 bitbake $2 -k;
@@ -494,6 +499,7 @@ for branch in meta_aws_demos_supported_branches:
494499
security_group_ids=[os.environ.get('BUILDBOT_WORKER_SECURITY_GROUP', 'default'),],
495500
subnet_id=os.environ.get('BUILDBOT_WORKER_SUBNET', 'default'),
496501
user_data=init_script.format(sstate_efs_dns_name, workername),
502+
tags={'meta-aws-buildbot': 'meta-aws-demos tests'},
497503
block_device_map= [
498504
{
499505
"DeviceName": "/dev/xvdf",

0 commit comments

Comments
 (0)