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

Restore cross-arch build of arm images #80

Merged
merged 2 commits into from
Jul 27, 2023

Conversation

Itxaka
Copy link
Member

@Itxaka Itxaka commented Jul 27, 2023

By playing with the buildarch and having separated luet repo files we can install the proper artifacts for each arch AND also teh arm64 artifacts for arm images under x86

By playing with the buildarch and having separated luet repo files we
can install the proper artifacts for each arch AND also teh arm64
artifacts for arm images under x86

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
@Itxaka Itxaka requested review from mudler and a team July 27, 2023 09:30
Is no longer provided by enki but by the sdk, so tests do not need to be
here anymore

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
@Itxaka Itxaka force-pushed the provider_cross_arch_artifacts branch from a911da8 to 758e97a Compare July 27, 2023 10:08
jimmykarily added a commit to kairos-io/kairos that referenced this pull request Jul 27, 2023
because the top level default always wins (Earthly...)

and downgrade osbuilder because it breaks arm builds. This should fix it:

kairos-io/osbuilder#80

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
Copy link
Member

@mauromorales mauromorales left a comment

Choose a reason for hiding this comment

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

lgtm

@Itxaka Itxaka merged commit 98f867f into kairos-io:master Jul 27, 2023
8 checks passed
jimmykarily added a commit to kairos-io/kairos that referenced this pull request Jul 28, 2023
because the top level default always wins (Earthly...)

and downgrade osbuilder because it breaks arm builds. This should fix it:

kairos-io/osbuilder#80

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
jimmykarily added a commit to kairos-io/kairos that referenced this pull request Jul 31, 2023
because the top level default always wins (Earthly...)

and downgrade osbuilder because it breaks arm builds. This should fix it:

kairos-io/osbuilder#80

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
jimmykarily added a commit to kairos-io/kairos that referenced this pull request Aug 2, 2023
because the top level default always wins (Earthly...)

and downgrade osbuilder because it breaks arm builds. This should fix it:

kairos-io/osbuilder#80

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
jimmykarily added a commit to kairos-io/kairos that referenced this pull request Aug 8, 2023
because the top level default always wins (Earthly...)

and downgrade osbuilder because it breaks arm builds. This should fix it:

kairos-io/osbuilder#80

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
jimmykarily added a commit to kairos-io/kairos that referenced this pull request Aug 8, 2023
* Use dev version for provider kairos in Earthly

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* [WIP] Build a matrix for standard (provider) images

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Build provider-kairos image with the right flags

E.g. Invoke it as:

earthly +iso -PROVIDER_KAIROS=true -PROVIDER_KAIROS_VERSION=2.3.0 -K3S_VERSION=1.24.2

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Use latest package for provider-kairos and k3s

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Remove PROVIDER_KAIROS_VERSION setting

because when we install with luet, the version is defined by the
repository in framework-profile.yaml

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Remove implemented TODO

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Construct the k8s versions by quering the luet repo for available ones

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* No need to change version strings

They are already in the required format for luet

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* WIP

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Remove default MODEL that doesn't work

because the top level default always wins (Earthly...)

and downgrade osbuilder because it breaks arm builds. This should fix it:

kairos-io/osbuilder#80

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Don't build standard images for nvidia jetson

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* WIP

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Drop PROVIDER_KAIROS and use VARIANT=standard instead

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* WIP

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* WIP

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* WIp

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Remove not used ARGs and simplify targets

Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>

* Try out on our branch

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Configure luet before searching it

Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>

* Try to fix luet

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Fix luet

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Fix signing path

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Bump CI

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Add debug job

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Remove dummy job and try to remove permissions

to see if they are actually needed anywhere

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Debug, debug, debug

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Switch back to old naming

we will deal with it on another PR

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Simplify jq syntax

Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>

* Fix arm image release pipeline (no generic yet)

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Fix luet installation in job

Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>

* Fix the release-arm pipeline

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Unshallow the checkout in the pipeline to build a proper VERSION

Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>

* Use the action fetch-depth instead of unshallow

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Fix earthly things

Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>

* WIP

Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>

* Remove our test branch from the workflow

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Remove done TODOs and make sure we install tools in all k3s versions

Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>

* Rename Earthly command and remove unnecessary copying

because the framework-profile should already be in place

(Fixes based on PR comments)

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Add nohang in base images (wherever it's available)

and remove the Earthly target for that.

Question: We only enable this on systemd:
  https://github.com/kairos-io/kairos/blob/master/overlay/files/system/oem/09_services.yaml#L21-L22
  What about systemd flavors that don't have it? (fedora, rockylinux,
  almalinux)

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Add repository for nohang in jetson dockerfile

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Filter which flavors to build standard image for

and stop running the release pipeline our current branch

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Fix name of matrix

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

---------

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Co-authored-by: Mauro Morales <mauro.morales@spectrocloud.com>
Co-authored-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants