Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jenkins Resources Increase #180

Merged
merged 5 commits into from
Aug 4, 2022
Merged

Jenkins Resources Increase #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c38aa5
fixed IAM roles and code cleanup
prudhvigodithi May 5, 2022
c93d8c0
parent 4c38aa5d3ae7993e33a611be2596247b387f848b
prudhvigodithi May 5, 2022
e93a1f4
Resource increase
prudhvigodithi Aug 4, 2022
ef5c12c
Update docker-compose
prudhvigodithi Aug 4, 2022
483c588
Update docker-compose: Fix tests
prudhvigodithi Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/compute/jenkins-main-node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ export class JenkinsMainNode {
InitCommand.shellCommand('pip3 install botocore'),
// eslint-disable-next-line max-len
InitCommand.shellCommand('sudo wget -nv https://github.com/mikefarah/yq/releases/download/v4.22.1/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq'),
// eslint-disable-next-line max-len
InitCommand.shellCommand('sudo curl -L https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/bin/docker-compose && sudo chmod +x /usr/bin/docker-compose'),
InitCommand.shellCommand('python3 -m pip install --upgrade pip && python3 -m pip install cryptography boto3 requests-aws4auth'),

InitCommand.shellCommand(httpConfigProps.useSsl
Expand Down
10 changes: 5 additions & 5 deletions resources/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ services:
- 50000:50000
container_name: jenkins
environment:
- JENKINS_JAVA_OPTS="-Xmx8g"
- JENKINS_JAVA_OPTS="-Xmx18g"
- CASC_RELOAD_TOKEN=reloadPasswordHere
volumes:
- /var/lib/jenkins:/var/jenkins_home
deploy:
resources:
limits:
cpus: '4'
memory: '10g'
cpus: '12'
memory: '20g'
reservations:
cpus: '4'
memory: '10g'
cpus: '12'
memory: '20g'
gaiksaya marked this conversation as resolved.
Show resolved Hide resolved
logging:
driver: awslogs
options:
Expand Down
2 changes: 1 addition & 1 deletion test/compute/jenkins-main-node.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe('JenkinsMainNode Config Elements', () => {

// THEN
test('Config elements expected counts', async () => {
expect(configElements.filter((e) => e.elementType === 'COMMAND')).toHaveLength(18);
expect(configElements.filter((e) => e.elementType === 'COMMAND')).toHaveLength(19);
expect(configElements.filter((e) => e.elementType === 'PACKAGE')).toHaveLength(10);
expect(configElements.filter((e) => e.elementType === 'FILE')).toHaveLength(4);
});
Expand Down