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.

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

fix: correct cygwin path #231

Merged

Conversation

lemeurherve
Copy link
Member

@lemeurherve lemeurherve commented May 13, 2022

Replaced "grep" sanity check by a listing of Cygwin tools folder (grep doesn't seems in the $PATH at that point)

Rel: jenkins-infra/helpdesk#2873

lemeurherveCB and others added 12 commits May 13, 2022 23:03
Added back grep sanity check
Rel: jenkins-infra/helpdesk#2873
* chore(packer) add support of packer 1.8.x

Signed-off-by: Damien Duportal <[email protected]>

* fix(packer) cleanup references to former .auto.pkrvars.hcl

Signed-off-by: Damien Duportal <[email protected]>

* feat(windows) increase the disk size above the 127 Gb limit (Azure limit)

Signed-off-by: Damien Duportal <[email protected]>

* chore: cleanup + refactor packer templates

- Support multiple OS versions
- Split HCL files to ease maintenance

Signed-off-by: Damien Duportal <[email protected]>

* chore(packer,updatecli) track plugin version with updatecli + bump amazon,azure and docker plugins to last versions

Signed-off-by: Damien Duportal <[email protected]>

* Apply suggestions from code review

Co-authored-by: Hervé Le Meur <[email protected]>

Co-authored-by: Hervé Le Meur <[email protected]>
@lemeurherve lemeurherve marked this pull request as ready for review May 14, 2022 10:37
@lemeurherve lemeurherve requested a review from dduportal May 14, 2022 10:37
Comment on lines 68 to 78
# function Choco-Install {
# [CmdletBinding()]
# param(
# [Parameter(Mandatory, ValueFromPipeline)]
# [string]$PackageName
# )
# Process {
# Invoke-Command & "choco.exe" install $PackageName --yes --no-progress --limit-output --fail-on-error-output
# }
# }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# function Choco-Install {
# [CmdletBinding()]
# param(
# [Parameter(Mandatory, ValueFromPipeline)]
# [string]$PackageName
# )
# Process {
# Invoke-Command & "choco.exe" install $PackageName --yes --no-progress --limit-output --fail-on-error-output
# }
# }

Copy link
Member Author

@lemeurherve lemeurherve May 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intent to add later a proper Choco-Install function, which would also look for potential CHOCOLATEY_$PackageNam.toUpper()_VERSION env var to pass as arg if exist

make worked great, but adding it to cygwin didn't, and since I have build already a lot of images on this PR, I postponed it.

@lemeurherve
Copy link
Member Author

from infra.ci:

2022-05-14T10:59:49Z: Build 'azure-arm.ubuntu' errored after 7 minutes 31 seconds: unexpected EOF

😥

Copy link
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏

@lemeurherve
Copy link
Member Author

Adding the new VM image definition in Azure:
image

@dduportal
Copy link
Contributor

Adding the new VM image definition in Azure: image

LGTM!

I'm currently adding them into Azure to improve tracking, I'll add you as reviewer

@lemeurherve lemeurherve merged commit f0984bd into jenkins-infra:main May 14, 2022
@lemeurherve lemeurherve deleted the fix-cygwin-path-helpdesk-2873 branch May 14, 2022 11:44
@dduportal dduportal added the bug Something isn't working label May 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants