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

Orka template updates #3906

Merged
merged 4 commits into from
Sep 16, 2024
Merged

Orka template updates #3906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01f78be
ci: ensure Homebrew environment is set up in the shell profile
UlisesGascon Sep 13, 2024
8628fe3
ci: add xz as dependency
UlisesGascon Sep 13, 2024
26f4f34
ci: add xcode version information
UlisesGascon Sep 13, 2024
a976199
ci: add tap2junit as dependency
UlisesGascon Sep 13, 2024
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
21 changes: 19 additions & 2 deletions orka/templates/macos-13-arm-release.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ build {
"eval \"$($(brew --prefix)/bin/brew shellenv)\""
]
}
// Ensure Homebrew environment is set up in the shell profile.
provisioner "shell" {
inline = [
"echo 'Setting up Homebrew environment in shell profile...'",
"echo 'eval \"$(/opt/homebrew/bin/brew shellenv)\"' >> /Users/admin/.zshrc",
"echo 'eval \"$(/opt/homebrew/bin/brew shellenv)\"' >> /Users/admin/.bash_profile"
]
}
// Check Homebrew. Ignore errors because we are not using the last version of Xcode.
provisioner "shell" {
inline = [
Expand All @@ -108,7 +116,15 @@ build {
inline = [
"echo 'Installing packages using Homebrew...'",
"eval \"$(/opt/homebrew/bin/brew shellenv)\"",
"/opt/homebrew/bin/brew install git automake bash libtool cmake python ccache"
"/opt/homebrew/bin/brew install git automake bash libtool cmake python ccache xz"
]
}
// Install tap2junit using pip.
provisioner "shell" {
inline = [
"echo 'Installing tap2junit using pip...'",
"python3 -m pip install --user tap2junit",
"export PATH=$PATH:/Users/admin/.local/bin"
]
}
// Install Java 17 for Jenkins.
Expand All @@ -125,7 +141,8 @@ build {
"echo 'Printing the version of the installed packages...'",
"eval \"$(/opt/homebrew/bin/brew shellenv)\"",
"/opt/homebrew/bin/brew list --versions",
"java -version"
"java -version",
"xcodebuild -version"
]
}
}
22 changes: 20 additions & 2 deletions orka/templates/macos-13-arm-test.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ build {
"eval \"$($(brew --prefix)/bin/brew shellenv)\""
]
}
// Ensure Homebrew environment is set up in the shell profile.
provisioner "shell" {
inline = [
"echo 'Setting up Homebrew environment in shell profile...'",
"echo 'eval \"$(/opt/homebrew/bin/brew shellenv)\"' >> /Users/admin/.zshrc",
"echo 'eval \"$(/opt/homebrew/bin/brew shellenv)\"' >> /Users/admin/.bash_profile"
]
}
// Check Homebrew. Ignore errors because we are not using the last version of Xcode.
provisioner "shell" {
inline = [
Expand All @@ -114,7 +122,15 @@ build {
inline = [
"echo 'Installing packages using Homebrew...'",
"eval \"$(/opt/homebrew/bin/brew shellenv)\"",
"/opt/homebrew/bin/brew install git automake bash libtool cmake python ccache"
"/opt/homebrew/bin/brew install git automake bash libtool cmake python ccache xz"
]
}
// Install tap2junit using pip.
provisioner "shell" {
inline = [
"echo 'Installing tap2junit using pip...'",
"python3 -m pip install --user tap2junit",
"export PATH=$PATH:/Users/admin/.local/bin"
]
}
// Install Java 17 for Jenkins.
Expand All @@ -131,7 +147,9 @@ build {
"echo 'Printing the version of the installed packages...'",
"eval \"$(/opt/homebrew/bin/brew shellenv)\"",
"/opt/homebrew/bin/brew list --versions",
"java -version"
"java -version",
// @TODO: Solve the problem with the Xcode version.
//"xcodebuild -version"
]
}
}
21 changes: 19 additions & 2 deletions orka/templates/macos-13-intel-release.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,14 @@ build {
"eval \"$($(brew --prefix)/bin/brew shellenv)\""
]
}
// Ensure Homebrew environment is set up in the shell profile.
provisioner "shell" {
inline = [
"echo 'Setting up Homebrew environment in shell profile...'",
"echo 'eval \"$(/usr/local/bin/brew shellenv)\"' >> /Users/admin/.zshrc",
"echo 'eval \"$(/usr/local/bin/brew shellenv)\"' >> /Users/admin/.bash_profile"
]
}
// Check Homebrew. Ignore errors because we are not using the last version of Xcode.
provisioner "shell" {
inline = [
Expand All @@ -106,7 +114,15 @@ build {
inline = [
"echo 'Installing packages using Homebrew...'",
"eval \"$(/usr/local/bin/brew shellenv)\"",
"/usr/local/bin/brew install git automake bash libtool cmake python ccache"
"/usr/local/bin/brew install git automake bash libtool cmake python ccache xz"
]
}
// Install tap2junit using pip.
provisioner "shell" {
inline = [
"echo 'Installing tap2junit using pip...'",
"python3 -m pip install --user tap2junit",
"export PATH=$PATH:/Users/admin/.local/bin"
]
}
// Install Java 17 for Jenkins.
Expand All @@ -123,7 +139,8 @@ build {
"echo 'Printing the version of the installed packages...'",
"eval \"$(/usr/local/bin/brew shellenv)\"",
"/usr/local/bin/brew list --versions",
"java -version"
"java -version",
"xcodebuild -version"
]
}
}
22 changes: 20 additions & 2 deletions orka/templates/macos-13-intel-test.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,14 @@ build {
"eval \"$($(brew --prefix)/bin/brew shellenv)\""
]
}
// Ensure Homebrew environment is set up in the shell profile.
provisioner "shell" {
inline = [
"echo 'Setting up Homebrew environment in shell profile...'",
"echo 'eval \"$(/usr/local/bin/brew shellenv)\"' >> /Users/admin/.zshrc",
"echo 'eval \"$(/usr/local/bin/brew shellenv)\"' >> /Users/admin/.bash_profile"
]
}
// Check Homebrew. Ignore errors because we are not using the last version of Xcode.
provisioner "shell" {
inline = [
Expand All @@ -113,7 +121,15 @@ build {
inline = [
"echo 'Installing packages using Homebrew...'",
"eval \"$(/usr/local/bin/brew shellenv)\"",
"/usr/local/bin/brew install git automake bash libtool cmake python ccache"
"/usr/local/bin/brew install git automake bash libtool cmake python ccache xz"
]
}
// Install tap2junit using pip.
provisioner "shell" {
inline = [
"echo 'Installing tap2junit using pip...'",
"python3 -m pip install --user tap2junit",
"export PATH=$PATH:/Users/admin/.local/bin"
]
}
// Install Java 17 for Jenkins.
Expand All @@ -130,7 +146,9 @@ build {
"echo 'Printing the version of the installed packages...'",
"eval \"$(/usr/local/bin/brew shellenv)\"",
"/usr/local/bin/brew list --versions",
"java -version"
"java -version",
// @TODO: Solve the problem with the Xcode version.
//"xcodebuild -version"
]
}
}