ManageIQ / manageiq-appliance-build

Scripts to build ManageIQ appliances
Apache License 2.0
10 stars 55 forks source link

Update to latest CentOS 8 Stream ISO #497

Closed bdunne closed 2 years ago

bdunne commented 2 years ago

This ISO is already in place on the build machines for master and morphy

miq-bot commented 2 years ago

Checked commit https://github.com/bdunne/manageiq-appliance-build/commit/f7753cdf969e42208af9fab867a01fcb1462e243 with ruby 2.6.3, rubocop 1.13.0, haml-lint 0.35.0, and yamllint 0 files checked, 0 offenses detected Everything looks fine. :cookie:

Fryguy commented 2 years ago

@bdunne A conflict occurred during the backport of this pull request to morphy.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the morphy branch in order to resolve this.

Conflict details:

diff --cc config/base.tdl.erb
index 73cd7cf,6b7b27a..0000000
--- a/config/base.tdl.erb
+++ b/config/base.tdl.erb
@@@ -6,7 -6,7 +6,11 @@@
      <version>4</version>
      <arch>x86_64</arch>
      <install type="iso">
++<<<<<<< HEAD
 +      <iso>file:///build/isos/CentOS-8.3.2011-x86_64-dvd1.iso</iso>
++=======
+       <iso>file:///build/isos/CentOS-Stream-8-x86_64-20211206-dvd1.iso</iso>
++>>>>>>> e1d7809... Merge pull request #497 from bdunne/update_stream_iso
      </install>
    </os>
    <description>CentOS TDL meant to be used with custom kickstart for manageiq.</description>
Fryguy commented 2 years ago

Backported to morphy via https://github.com/ManageIQ/manageiq-appliance-build/pull/498