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

[Python 3.9 Upgrade] Update macos agent to Python 3.9 export and add M58xlarge gradle check runner #323

Merged
merged 2 commits into from
Jul 10, 2023
Merged

[Python 3.9 Upgrade] Update macos agent to Python 3.9 export and add M58xlarge gradle check runner #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b18817
Add M58xlarge 32/128 CPU/MEM ratio gradle check runner
peterzhuamazon Jul 10, 2023
985996a
Update macos agent to use Python 3.9 exported path
peterzhuamazon Jul 10, 2023
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
3 changes: 2 additions & 1 deletion lib/ci-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ export class CIStack extends Stack {

this.agentNodes = [
agentNode.AL2_X64, agentNode.AL2_X64_DOCKER_HOST, agentNode.AL2023_X64_DOCKER_HOST_PERF_TEST, agentNode.AL2023_X64_DOCKER_HOST_BENCHMARK_TEST,
agentNode.AL2_ARM64, agentNode.AL2_ARM64_DOCKER_HOST, agentNode.UBUNTU2004_X64_GRADLE_CHECK, agentNode.UBUNTU2004_X64_DOCKER_BUILDER,
agentNode.AL2_ARM64, agentNode.AL2_ARM64_DOCKER_HOST,
agentNode.UBUNTU2004_X64_GRADLE_CHECK, agentNode.UBUNTU2004_X64_GRADLE_CHECK_NEW_SPECS, agentNode.UBUNTU2004_X64_DOCKER_BUILDER,
agentNode.MACOS12_X64_MULTI_HOST, agentNode.WINDOWS2019_X64, agentNode.WINDOWS2019_X64_GRADLE_CHECK,
];
} else {
Expand Down
15 changes: 15 additions & 0 deletions lib/compute/agent-nodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export class AgentNodes {

readonly UBUNTU2004_X64_GRADLE_CHECK: AgentNodeProps;

readonly UBUNTU2004_X64_GRADLE_CHECK_NEW_SPECS: AgentNodeProps;

readonly UBUNTU2004_X64_DOCKER_BUILDER: AgentNodeProps;

readonly MACOS12_X64_MULTI_HOST: AgentNodeProps;
Expand Down Expand Up @@ -130,6 +132,19 @@ export class AgentNodes {
+ ' sudo apt-get update -y && (sudo killall -9 apt-get apt 2>&1 || echo) && sudo env "DEBIAN_FRONTEND=noninteractive" apt-get upgrade -y',
remoteFs: '/var/jenkins',
};
this.UBUNTU2004_X64_GRADLE_CHECK_NEW_SPECS = {
agentType: 'unix',
workerLabelString: 'Jenkins-Agent-Ubuntu2004-X64-M58xlarge-Single-Host',
instanceType: 'M58xlarge',
remoteUser: 'ubuntu',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 0,
numExecutors: 1,
amiId: 'ami-0776ef32c1c17729d',
initScript: 'sudo apt-mark hold docker docker.io openssh-server gh grub-efi* shim-signed && docker ps &&'
+ ' sudo apt-get update -y && (sudo killall -9 apt-get apt 2>&1 || echo) && sudo env "DEBIAN_FRONTEND=noninteractive" apt-get upgrade -y',
remoteFs: '/var/jenkins',
};
this.UBUNTU2004_X64_DOCKER_BUILDER = {
agentType: 'unix',
workerLabelString: 'Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder',
Expand Down
2 changes: 1 addition & 1 deletion packer/files/macos/bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
export PATH=/opt/local/bin:$PATH
export PATH=/Users/ec2-user/Library/Python/3.7/bin:/opt/local/Library/Frameworks/Python.framework/Versions/3.7/bin:$PATH
export PATH=/Users/ec2-user/Library/Python/3.9/bin:/opt/local/Library/Frameworks/Python.framework/Versions/3.9/bin:$PATH
export PATH=/usr/local/opt/grep/libexec/gnubin:$PATH
export PATH=/usr/local/opt/gnu-sed/libexec/gnubin:$PATH