Skip to content

Pkg 370 update jen farm amzn2023 plus fixes #3292

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Pkg 370 update jen farm amzn2023 plus fixes #3292

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b2bd12
PKG-370 Jenkins farm fixes
vorsel Apr 23, 2025
777cc3b
PKG-370 pg.cd: Jenkins farm fixes
vorsel Apr 24, 2025
09ce981
PKG-370 ps57.cd: Jenkins farm fixes
vorsel Apr 29, 2025
fd1a38f
Merge branch 'Percona-Lab:master' into PKG-370_update_jen_farm_amzn20…
vorsel Apr 29, 2025
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
17 changes: 9 additions & 8 deletions IaC/ps57.cd/JenkinsStack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ Resources:
VpcId: !Ref JVPC
CidrBlock: 10.177.2.0/24
MapPublicIpOnLaunch: true
AvailabilityZone:
Fn::Select: [ 2, !GetAZs '' ]
AvailabilityZone: eu-central-1c
#AvailabilityZone:
# Fn::Select: [ 2, !GetAZs '' ]
Tags:
- Key: Name
Value: !Join [ '-', [ !Ref JShortName, 'C' ]]
Expand Down Expand Up @@ -442,7 +443,7 @@ Resources:
ExcessCapacityTerminationPolicy: default
IamFleetRole: !GetAtt SpotFleetRole.Arn
ReplaceUnhealthyInstances: true
SpotPrice: 0.15
SpotPrice: 0.17
TargetCapacity: 1
TerminateInstancesWithExpiration: false
Type: maintain
Expand All @@ -451,16 +452,16 @@ Resources:
LaunchTemplateId: !Ref JMasterTemplate
Version: !GetAtt JMasterTemplate.LatestVersionNumber
Overrides:
- InstanceType: m5a.large
- InstanceType: i3en.large
AvailabilityZone:
Fn::Select: [ 1, !GetAZs '' ]
- InstanceType: m5d.large
- InstanceType: i4i.large
AvailabilityZone:
Fn::Select: [ 1, !GetAZs '' ]
- InstanceType: m5zn.large
- InstanceType: r5a.large
AvailabilityZone:
Fn::Select: [ 1, !GetAZs '' ]
- InstanceType: m5ad.large
- InstanceType: r5dn.large
AvailabilityZone:
Fn::Select: [ 1, !GetAZs '' ]

Expand Down Expand Up @@ -737,7 +738,7 @@ Resources:
EOF
fi

ln -s /mnt/$JENKINS_HOST/ssl/nginx.conf /usr/local/openresty/nginx/conf/jenkins.conf
ln -f -s /mnt/$JENKINS_HOST/ssl/nginx.conf /usr/local/openresty/nginx/conf/jenkins.conf
sed -i'' -e 's/listen/#listen/; s/mime.types/jenkins.conf/' /usr/local/openresty/nginx/conf/nginx.conf

systemctl enable --now openresty
Expand Down