Skip to content

Commit 92bf201

Browse files
thomas-roosthomas-roos
committed
update buildbot, make filesystem bigger
1 parent 0136c53 commit 92bf201

File tree

5 files changed

+93
-87
lines changed

5 files changed

+93
-87
lines changed

‎configuration/admin/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ EXPOSE 9989
1818
RUN python3 -m pip install --upgrade pip
1919
RUN python3 -m pip install boto3 botocore
2020
RUN python3 -m pip install git-remote-codecommit
21-
RUN python3 -m pip install 'buildbot[bundle]==v3.11.2'
21+
RUN python3 -m pip install buildbot[bundle]
2222

2323
ENV PATH="/home/user/.local/bin:${PATH}"
2424

‎configuration/admin/admin.cfg

+17-11
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ c['builders'].append(util.BuilderConfig(name="reload_config_factory",workernames
114114
c['change_source'].append(changes.GitPoller(
115115
os.environ.get('CODECOMMIT_REPOSITORY_CLONE_URL_GRC', 'default'),
116116
workdir='gitpoller-workdir',
117-
branches='main',
117+
branches=['main'],
118118
pollAtLaunch=False,
119119
pollInterval=1*60))
120120

@@ -199,7 +199,7 @@ c['workers'].append(worker.EC2LatentWorker(workername, 'sekrit', 'c5.metal',
199199
"Ebs" : {
200200
"VolumeType": "gp3",
201201
"Iops": 16000,
202-
"VolumeSize": 500,
202+
"VolumeSize": 1000,
203203
"Throughput": 1000,
204204
"DeleteOnTermination": True,
205205
}
@@ -252,7 +252,7 @@ for instance in x86_64_instance_types:
252252
"Ebs" : {
253253
"VolumeType": "gp3",
254254
"Iops": 16000,
255-
"VolumeSize": 500,
255+
"VolumeSize": 1000,
256256
"Throughput": 1000,
257257
"DeleteOnTermination": True,
258258
}
@@ -276,7 +276,7 @@ for instance in arm_64_instance_types:
276276
"Ebs" : {
277277
"VolumeType": "gp3",
278278
"Iops": 16000,
279-
"VolumeSize": 500,
279+
"VolumeSize": 1000,
280280
"Throughput": 1000,
281281
"DeleteOnTermination": True,
282282
}
@@ -304,21 +304,21 @@ c['change_source'].append(changes.GitPoller(
304304
"https://github.com/aws4embeddedlinux/meta-aws.git",
305305
workdir=gitpoller_workdir,
306306
pollAtLaunch=False,
307-
pollinterval=10*60,
307+
pollInterval=10*60,
308308
branches=meta_aws_supported_releases_next))
309309

310310
c['change_source'].append(changes.GitPoller(
311311
"https://github.com/yoctoproject/poky.git",
312312
workdir=gitpoller_workdir,
313313
pollAtLaunch=False,
314-
pollinterval=10*60,
314+
pollInterval=10*60,
315315
branches=meta_aws_supported_releases))
316316

317317
c['change_source'].append(changes.GitPoller(
318318
"https://github.com/openembedded/meta-openembedded.git",
319319
workdir=gitpoller_workdir,
320320
pollAtLaunch=False,
321-
pollinterval=10*60,
321+
pollInterval=10*60,
322322
branches=meta_aws_supported_releases))
323323

324324
for release in meta_aws_supported_releases:
@@ -342,7 +342,7 @@ for release in meta_aws_supported_releases:
342342
"Ebs" : {
343343
"VolumeType": "gp3",
344344
"Iops": 16000,
345-
"VolumeSize": 500,
345+
"VolumeSize": 1000,
346346
"Throughput": 1000,
347347
"DeleteOnTermination": True,
348348
}
@@ -399,7 +399,7 @@ for release in meta_aws_supported_releases:
399399
"Ebs" : {
400400
"VolumeType": "gp3",
401401
"Iops": 16000,
402-
"VolumeSize": 500,
402+
"VolumeSize": 1000,
403403
"Throughput": 1000,
404404
"DeleteOnTermination": True,
405405
}
@@ -453,7 +453,7 @@ for branch in meta_aws_demos_supported_branches:
453453
set -euxo pipefail;
454454
echo 'ACCEPT_FSL_EULA = \"1\"' >> conf/local.conf ;
455455
echo 'BB_DANGLINGAPPENDS_WARNONLY = \"1\"' >> conf/local.conf ;
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\";
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\" \"rpi5 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\" \"ti-am572x-idk aws-greengrass-test-image\";
457457
do set -- $i # Convert the "tuple" into the param args $1 $2... ;
458458
echo DEVICE: $1 and IMAGE: $2;
459459
BB_ENV_PASSTHROUGH_ADDITIONS="SSTATE_DIR $BB_ENV_PASSTHROUGH_ADDITIONS" SSTATE_DIR="/sstate" DEVICE=$1 IMAGE=$2 bitbake $2 -k;
@@ -506,7 +506,7 @@ for branch in meta_aws_demos_supported_branches:
506506
"Ebs" : {
507507
"VolumeType": "gp3",
508508
"Iops": 16000,
509-
"VolumeSize": 500,
509+
"VolumeSize": 1000,
510510
"Throughput": 1000,
511511
"DeleteOnTermination": True,
512512
}
@@ -536,4 +536,10 @@ for branch in meta_aws_demos_supported_branches:
536536
builderNames=[buildername], dayOfWeek=5, hour=3, minute=1))
537537

538538

539+
#### define log preview number of lines
540+
c['www']['ui_default_config'] = {
541+
'LogPreview.loadlines': 100,
542+
'LogPreview.maxlines': 300,
543+
}
544+
539545
#### user.cfg gets pasted at the end of this file ####

‎configuration/user-repo/user.cfg

+47-47
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
### user.cfg ###
22

33

4-
#### core-image-minimal example ######################
5-
c['change_source'].append(changes.GitPoller(
6-
"https://github.com/yoctoproject/poky.git",
7-
workdir='gitpoller-workdir', branch='master-next',
8-
pollinterval=60))
9-
10-
c['schedulers'].append(schedulers.SingleBranchScheduler(
11-
name="check_poky",
12-
change_filter=util.ChangeFilter(branch="master-next",repository="https://github.com/yoctoproject/poky.git"),
13-
treeStableTimer=60*2,
14-
builderNames=["core_image_minimal_builder_c7g_16xlarge"]))
15-
16-
core_image_minimal_factory = util.BuildFactory()
17-
18-
core_image_minimal_factory.addStep(steps.Git(repourl='https://github.com/yoctoproject/poky.git'))
19-
core_image_minimal_factory.addStep(steps.ShellCommand(command=['/bin/bash', '-c', '''source oe-init-build-env ; echo 'SSTATE_DIR = \"/sstate\"' > conf/site.conf ; bitbake core-image-minimal''']))
20-
21-
c['workers'].append(worker.EC2LatentWorker("core_image_minimal_worker_c7g_16xlarge", 'sekrit', 'c7g.16xlarge',
22-
ami=arm64_ami,
23-
build_wait_timeout=0,
24-
keypair_name='worker-key',
25-
security_group_ids=[os.environ.get('BUILDBOT_WORKER_SECURITY_GROUP', 'default'),],
26-
subnet_id=os.environ.get('BUILDBOT_WORKER_SUBNET', 'default'),
27-
user_data=init_script.format(sstate_efs_dns_name, 'core_image_minimal_worker_c7g_16xlarge'),
28-
block_device_map= [
29-
{
30-
"DeviceName": "/dev/xvdf",
31-
"Ebs" : {
32-
"VolumeType": "gp3",
33-
"Iops": 16000,
34-
"VolumeSize": 500,
35-
"Throughput": 1000,
36-
}
37-
}
38-
],
39-
))
40-
41-
c['builders'].append(
42-
util.BuilderConfig(name="core_image_minimal_builder_c7g_16xlarge",
43-
workernames=["core_image_minimal_worker_c7g_16xlarge"],
44-
factory=core_image_minimal_factory))
45-
46-
c['schedulers'].append(
47-
schedulers.ForceScheduler(
48-
name="core_image_minimal_c7g_16xlarge",
49-
builderNames=["core_image_minimal_builder_c7g_16xlarge"],
50-
buttonName="force"))
4+
### core-image-minimal example ######################
5+
#c['change_source'].append(changes.GitPoller(
6+
# "https://github.com/yoctoproject/poky.git",
7+
# workdir='gitpoller-workdir', branch='master-next',
8+
# pollinterval=60))
9+
#
10+
#c['schedulers'].append(schedulers.SingleBranchScheduler(
11+
# name="check_poky",
12+
# change_filter=util.ChangeFilter(branch="master-next",repository="https://github.com/yoctoproject/poky.git"),
13+
# treeStableTimer=60*2,
14+
# builderNames=["core_image_minimal_builder_c7g_16xlarge"]))
15+
#
16+
#core_image_minimal_factory = util.BuildFactory()
17+
#
18+
#core_image_minimal_factory.addStep(steps.Git(repourl='https://github.com/yoctoproject/poky.git'))
19+
#core_image_minimal_factory.addStep(steps.ShellCommand(command=['/bin/bash', '-c', '''source oe-init-build-env ; echo 'SSTATE_DIR = \"/sstate\"' > conf/site.conf ; bitbake core-image-minimal''']))
20+
#
21+
#c['workers'].append(worker.EC2LatentWorker("core_image_minimal_worker_c7g_16xlarge", 'sekrit', 'c7g.16xlarge',
22+
# ami=arm64_ami,
23+
# build_wait_timeout=0,
24+
# keypair_name='worker-key',
25+
# security_group_ids=[os.environ.get('BUILDBOT_WORKER_SECURITY_GROUP', 'default'),],
26+
# subnet_id=os.environ.get('BUILDBOT_WORKER_SUBNET', 'default'),
27+
# user_data=init_script.format(sstate_efs_dns_name, 'core_image_minimal_worker_c7g_16xlarge'),
28+
# block_device_map= [
29+
# {
30+
# "DeviceName": "/dev/xvdf",
31+
# "Ebs" : {
32+
# "VolumeType": "gp3",
33+
# "Iops": 16000,
34+
# "VolumeSize": 500,
35+
# "Throughput": 1000,
36+
# }
37+
# }
38+
# ],
39+
# ))
40+
#
41+
#c['builders'].append(
42+
# util.BuilderConfig(name="core_image_minimal_builder_c7g_16xlarge",
43+
# workernames=["core_image_minimal_worker_c7g_16xlarge"],
44+
# factory=core_image_minimal_factory))
45+
#
46+
#c['schedulers'].append(
47+
# schedulers.ForceScheduler(
48+
# name="core_image_minimal_c7g_16xlarge",
49+
# builderNames=["core_image_minimal_builder_c7g_16xlarge"],
50+
# buttonName="force"))

‎lib/app.ts

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22
import { App } from 'aws-cdk-lib';
33

4-
import { CacheRepoStack, CachePipeline, CacheEcrStack, CacheEcsStack } from './cache-server';
4+
// import { CacheRepoStack, CachePipeline, CacheEcrStack, CacheEcsStack } from './cache-server';
55
import { BuildBotConfig, BuildBotImageRepo, BuildBotPipeline, BuildBotServer, BuildBotFilesystem } from './buildbot';
66
import { DeveloperStages, FederateOIDC } from './constants';
77
import { Vpc, Cluster, ServiceDomain } from './stacks';
@@ -38,24 +38,24 @@ if (dev) {
3838
terminationProtection,
3939
});
4040

41-
const ssr = new CacheRepoStack(app, 'CacheRepo-Personal', {
42-
env,
43-
terminationProtection,
44-
});
45-
46-
const ecr = new CacheEcrStack(app, 'CacheEcr-Personal', {
47-
env,
48-
terminationProtection,
49-
});
50-
51-
const ecs = new CacheEcsStack(app, 'CacheEcs-Personal', {
52-
env,
53-
terminationProtection,
54-
repository: ecr.repo,
55-
cluster: cluster.cluster,
56-
vpc: vpc.vpc,
57-
namespace: serviceDomain.namespace,
58-
});
41+
// const ssr = new CacheRepoStack(app, 'CacheRepo-Personal', {
42+
// env,
43+
// terminationProtection,
44+
// });
45+
46+
// const ecr = new CacheEcrStack(app, 'CacheEcr-Personal', {
47+
// env,
48+
// terminationProtection,
49+
// });
50+
51+
// const ecs = new CacheEcsStack(app, 'CacheEcs-Personal', {
52+
// env,
53+
// terminationProtection,
54+
// repository: ecr.repo,
55+
// cluster: cluster.cluster,
56+
// vpc: vpc.vpc,
57+
// namespace: serviceDomain.namespace,
58+
// });
5959

6060
const buildBotConfig = new BuildBotConfig(app, 'BuildBotConfig-Personal', {
6161
env,
@@ -102,13 +102,13 @@ if (dev) {
102102
workerSstateEfsFsID: buildBotServer.sstateFS.fileSystemId,
103103
});
104104

105-
new CachePipeline(app, 'CachePipeline-Personal', {
106-
env,
107-
terminationProtection,
108-
repository: ecr.repo,
109-
cacheRepo: ssr.repo.repositoryName,
110-
ecsCacheFargateService: ecs.service,
111-
});
105+
// new CachePipeline(app, 'CachePipeline-Personal', {
106+
// env,
107+
// terminationProtection,
108+
// repository: ecr.repo,
109+
// cacheRepo: ssr.repo.repositoryName,
110+
// ecsCacheFargateService: ecs.service,
111+
// });
112112
}
113113

114114
// End

‎lib/buildbot/buildbot-server.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ export class BuildBotServer extends cdk.Stack {
103103
// Set up the ECS Server.
104104
const buildBotServerTask = new ecs.TaskDefinition(this, 'BuildBotServerTask', {
105105
compatibility: ecs.Compatibility.FARGATE,
106-
cpu: '4096',
107-
memoryMiB: '8192',
106+
cpu: '8192',
107+
memoryMiB: '16384',
108108
volumes: [
109109
{
110110
name: 'DBMount',

0 commit comments

Comments
 (0)