Repository: osbuild/osbuild-composer
Pull request #1125 (2020-12-01 18:02:59)

distro/rhel84: use the org.osbuild.rhel84 runner
The RHEL 8.4 specific runner was introduced in osbuild 22, released on the 8th of October 2020. It should by now be in relevant Fedora releases and RHEL 8.4.


Patch:
diff --git a/internal/distro/rhel84/distro.go b/internal/distro/rhel84/distro.go
index afd3e1bbf..5ee3c26aa 100644
--- a/internal/distro/rhel84/distro.go
+++ b/internal/distro/rhel84/distro.go
@@ -229,8 +229,7 @@ func sources(packages []rpmmd.PackageSpec) *osbuild.Sources {
 
 func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSpecs, buildPackageSpecs []rpmmd.PackageSpec) (*osbuild.Pipeline, error) {
 	p := &osbuild.Pipeline{}
-	// TODO add osbuild rhel84 runner
-	p.SetBuild(t.buildPipeline(repos, *t.arch, buildPackageSpecs), "org.osbuild.rhel83")
+	p.SetBuild(t.buildPipeline(repos, *t.arch, buildPackageSpecs), "org.osbuild.rhel84")
 
 	if t.arch.Name() == "s390x" {
 		p.AddStage(osbuild.NewKernelCmdlineStage(&osbuild.KernelCmdlineStageOptions{


Test patch:
diff --git a/test/data/manifests/rhel_84-x86_64-ami-boot.json b/test/data/manifests/rhel_84-x86_64-ami-boot.json
index 9432f78d6..6ac948bc7 100644
--- a/test/data/manifests/rhel_84-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ami-boot.json
@@ -1884,7 +1884,7 @@
             }
           ]
         },
-        "runner": "org.osbuild.rhel83"
+        "runner": "org.osbuild.rhel84"
       },
       "stages": [
         {
diff --git a/test/data/manifests/rhel_84-x86_64-openstack-boot.json b/test/data/manifests/rhel_84-x86_64-openstack-boot.json
index ea28365b2..3a0981aa8 100644
--- a/test/data/manifests/rhel_84-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-openstack-boot.json
@@ -2012,7 +2012,7 @@
             }
           ]
         },
-        "runner": "org.osbuild.rhel83"
+        "runner": "org.osbuild.rhel84"
       },
       "stages": [
         {
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
index f3730e487..3511c6a24 100644
--- a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
@@ -2072,7 +2072,7 @@
             }
           ]
         },
-        "runner": "org.osbuild.rhel83"
+        "runner": "org.osbuild.rhel84"
       },
       "stages": [
         {
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-customize.json b/test/data/manifests/rhel_84-x86_64-qcow2-customize.json
index 92d812a04..23114114e 100644
--- a/test/data/manifests/rhel_84-x86_64-qcow2-customize.json
+++ b/test/data/manifests/rhel_84-x86_64-qcow2-customize.json
@@ -2124,7 +2124,7 @@
             }
           ]
         },
-        "runner": "org.osbuild.rhel83"
+        "runner": "org.osbuild.rhel84"
       },
       "stages": [
         {
diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_84-x86_64-vhd-boot.json
index d4e2fc3eb..951688137 100644
--- a/test/data/manifests/rhel_84-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-vhd-boot.json
@@ -1985,7 +1985,7 @@
             }
           ]
         },
-        "runner": "org.osbuild.rhel83"
+        "runner": "org.osbuild.rhel84"
       },
       "stages": [
         {
diff --git a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
index d4d08c8ed..ced3274f4 100644
--- a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
@@ -1919,7 +1919,7 @@
             }
           ]
         },
-        "runner": "org.osbuild.rhel83"
+        "runner": "org.osbuild.rhel84"
       },
       "stages": [
         {