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

[CI:DOCS] Installer: Use windows image with latest wix #22408

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

[CI:DOCS] Installer: Use windows image with latest wix #22408

wants to merge 13 commits into from

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Apr 17, 2024

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added release-note-none do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Apr 17, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Apr 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 17, 2024
@lsm5 lsm5 changed the title [DO NOT MERGE] wix update [skip-ci] [DO NOT MERGE] wix update Apr 17, 2024
@lsm5 lsm5 force-pushed the wix-bump branch 2 times, most recently from 8196428 to da13f84 Compare April 17, 2024 13:50
@packit-as-a-service Packit-as-a-Service
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@lsm5 lsm5 force-pushed the wix-bump branch 2 times, most recently from 5346ecd to f6f45e9 Compare April 17, 2024 19:42
@lsm5 lsm5 changed the title [skip-ci] [DO NOT MERGE] wix update [CI:DOCS] Installer: use latest wix in windows installer Apr 17, 2024
@ashley-cui
Copy link
Member

The wix version probably also needs to be updated here, as it looks like we're hardcoding WiX 3.14

podman/contrib/win-installer/build.ps1

Line 102 in 60e0ef3

$Env:Path="$Env:Path;C:\Program Files (x86)\WiX Toolset v3.14\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin;;C:\Program Files\Go\bin"

@packit-as-a-service Packit-as-a-Service
Copy link

Cockpit tests failed for commit f6f45e9. @martinpitt, @jelly, @mvollmer please check.

@lsm5
Copy link
Member Author

lsm5 commented Apr 17, 2024

The wix version probably also needs to be updated here, as it looks like we're hardcoding WiX 3.14

podman/contrib/win-installer/build.ps1

Line 102 in 60e0ef3

$Env:Path="$Env:Path;C:\Program Files (x86)\WiX Toolset v3.14\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin;;C:\Program Files\Go\bin"

@ashley-cui ugh, do you know if we can wildcard / skip it ? I'm hoping this way we can just use the version that dotnet installs and be done with it.

@packit-as-a-service Packit-as-a-Service
Copy link

Cockpit tests failed for commit 79506f9. @martinpitt, @jelly, @mvollmer please check.

@ashley-cui
Copy link
Member

@lsm5 I haven't tinkered with it enough to know unfortunately :(

@lsm5 lsm5 force-pushed the wix-bump branch 2 times, most recently from 723ede2 to e7884f0 Compare April 18, 2024 14:46
@packit-as-a-service Packit-as-a-Service
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@packit-as-a-service Packit-as-a-Service
Copy link

Cockpit tests failed for commit 723ede2. @martinpitt, @jelly, @mvollmer please check.

@packit-as-a-service Packit-as-a-Service
Copy link

Cockpit tests failed for commit e7884f0. @martinpitt, @jelly, @mvollmer please check.

@packit-as-a-service Packit-as-a-Service
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@lsm5 lsm5 force-pushed the wix-bump branch 5 times, most recently from 3b74b3a to 71c72cc Compare April 22, 2024 19:35
@lsm5
Copy link
Member Author

lsm5 commented May 9, 2024

igonre packit failures

@lsm5 lsm5 changed the title [CI:DOCS] Installer: use latest wix in windows installer [CI:DOCS] Installer: Use windows image with latest wix May 9, 2024
@lsm5
Copy link
Member Author

lsm5 commented May 9, 2024

So, looks like build.ps1 should be good to go. CheckCommand wix ... works.

I need to now update contrib/win-installer/build-msi.bat and replace heat, candle and light with wix build. @l0rd is that something you were looking into already?

@l0rd
Copy link
Collaborator

l0rd commented May 9, 2024

No, I haven't looked at the migration to WiX 4/5 but I would expect changes to the wxs/xml files (the schemas have changed). And my PR that is currently under review has some changes to those files so, if possible, use my branch as the base for your work.

@lsm5 lsm5 force-pushed the wix-bump branch 3 times, most recently from 58ea54f to f93d4c2 Compare May 10, 2024 13:40
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2024
l0rd and others added 3 commits May 10, 2024 09:42
@l0rd @lsm5
Add Hyper-V option in windows installer
970d714 
podman.msi GUI has a radio-button to select WSL or Hyper-V

The checkbox in podman.msi GUI allow the user to specify if
the machine provider installation (WSL or Hyper-V) should
be part of podman installation or not.

podman-setup.exe supports 2 new variables: MachineProvider
(valid values are `wsl` and `hyperv`) and HyperVCheckbox
(valid values are `0` and `1`)

Installation creates the configuration file
`99-podman-machine-provider.conf` under folder
`%APPDATA\containers\containers.conf.d` with the selected
machine provider

Cirrus CI `win_installer_task` tests the installation with
both `hyperv` and `wsl` and verifies the configuration.
Uninstallation is tested too.

Note that podman-setup.exe GUI doesn't allow to choose the
provider yet. See containers#22492

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
@lsm5
[CI:DOCS] Installer: Use windows image with latest wix
32188b5 
Replace choco with dotnet for wix installation as choco doesn't have
anything newer than v3.14.
Ref: https://community.chocolatey.org/packages/wixtoolset

This commit also uses an updated windows image that installs the latest
wix using the dotnet runtime.
Ref: containers/automation_images#354

Resolves: RUN-2055

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
install heat
87b5246 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2024
lsm5 added 6 commits May 10, 2024 15:28
@lsm5
wix convert
93b3403 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
use new wix steps
0455d62 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
disable packit
2d69e9f 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
update image
b3e433e 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
update heat path
2542a0f 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
remove podman.proj
1e5897d 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5 lsm5 force-pushed the wix-bump branch 2 times, most recently from e86fac9 to 0169524 Compare May 10, 2024 19:56
@lsm5
remove bom and trailing whitespaces
2cb8222 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
lsm5 added 3 commits May 10, 2024 16:41
@lsm5
fix docs path for heat
b8d2331 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
install heat in github action
0c0a4c2 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
disable heat
c0840c1 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 19, 2024
@openshift-merge-robot
Copy link
Collaborator

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cevich cevich cevich left review comments

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. machine needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note-none
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lsm5 @ashley-cui @l0rd @openshift-merge-robot @cevich