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

Feat/edk2 202408 #333

Merged
merged 6 commits into from
Sep 24, 2024
Merged

Feat/edk2 202408 #333

merged 6 commits into from
Sep 24, 2024

Conversation

AtomicFS
Copy link
Collaborator

@AtomicFS AtomicFS commented Sep 17, 2024

Must be merged after #332

So I tried to add new edk2-stable202408 container and oh boy, there was a lot to do. Pardon me but I will be a bit verbose here (mostly for sake of future me):

  • I had some issues during building the containers locally, so I had to debug the Python code that have not been touched in a long time. Thankfully it was just dagger issue, so I added more helpful error messages. And while doing that I also removed some old Python code that seemed to be useless.
  • Then I ran out of disk space while building the container (yet again) so I had to further slim down the containers.
    • I have done that by applying the same trick I used for edk2-platforms and edk2-non-osi repositories to edk2, but this required changes in the Dockerfiles and compose.yaml.
    • I was firmly reminded why I did not do it the first time around - the ancient UDK2017 was a problematic one. There is a tag UDK2017 and branch vUDK2017 and they are completely different. And of course I did accidentally (again) switch from functional UDK2017 branch to broken vUDK2017 tag by using wrong commit hash in compose.yaml. This time I noticed what was the actual problem which allowed me to use this disk-saving approach.
    • There is still a problem of too much disk space being used, so I temporarily disabled testing of the docker containers - this should not be a problem since our containers have been rock-solid for quite some time now.
    • This problem should still be addressed (must be addressed before next release), so I opened a issue building docker containers uses too much disk space #338
  • As if this was not enough, I had issues with building the newest edk2 container, while all previous ones worked fine. I was informed that this is caused by recent change that requires -D BUILD_ARCH=X64 to be added to the build command. Thankfully this does not cause problems in old containers.
  • Because it has been a while since I added new container, I kinda forgot all the steps, so I added notes on this topic into the documentation.

@github-actions github-actions bot added feature New feature or request docker docker related dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code python Pull requests that update Python code labels Sep 17, 2024
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Sep 17, 2024
@AtomicFS AtomicFS force-pushed the feat/edk2-202408 branch 2 times, most recently from f41787f to 873beb5 Compare September 19, 2024 09:36
@AtomicFS AtomicFS force-pushed the feat/edk2-202408 branch 3 times, most recently from d03ffdc to 187ddf2 Compare September 23, 2024 14:24
@github-actions github-actions bot added the testing Testing related label Sep 23, 2024
@AtomicFS AtomicFS force-pushed the feat/edk2-202408 branch 2 times, most recently from f95a3a5 to f1861e5 Compare September 23, 2024 18:20
- timeouts are specific to the container type being built, this is
  because the time varies a lot

Signed-off-by: AtomicFS <[email protected]>
- the testing takes up too much space at the moment because of tarball
  export and import which is completely unnecessary
- edk2 containers take up around 2.1 GB, combined with export and
  import that means 3x2.1 GB which overflows GitHubs 14 GB disk space
- we should switch to dagger way of branching off a separate container
  for testing (just like we do for interactive mode)

Signed-off-by: AtomicFS <[email protected]>
@AtomicFS
Copy link
Collaborator Author

@MDr164 this should work now. Review pls.

Copy link
Collaborator

@MDr164 MDr164 left a comment

Choose a reason for hiding this comment

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

Your PR text explains well enough why those TODO changes had been necessary so I'd say this is good to go under the current circumstances.

@AtomicFS AtomicFS added this pull request to the merge queue Sep 24, 2024
Merged via the queue into main with commit 674a5c9 Sep 24, 2024
63 checks passed
@AtomicFS AtomicFS deleted the feat/edk2-202408 branch September 24, 2024 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file docker docker related documentation Improvements or additions to documentation feature New feature or request github_actions Pull requests that update GitHub Actions code module/edk2 python Pull requests that update Python code testing Testing related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants