Repository: osbuild/osbuild-composer
Pull request #2429 (2022-03-13 08:52:49)

packer: use unique name tag for Fedora workers
Signed-off-by: Ondřej Budai <ondrej@budai.cz>


This pull request includes:

- [ ] adequate testing for the new functionality or fixed issue
- [ ] adequate documentation informing people about the change such as
  - [ ] submit a PR for the [guides](https://github.com/osbuild/guides) repository if this PR changed any behavior described there: https://www.osbuild.org/guides/

<!--
Thanks for proposing a change to osbuild-composer!

Please don't remove the above check list. These are things that each pull
request must have before it is merged. It helps maintainers to not forget
anything.

If the reason for ticking any of the boxes is ambiguous, please add a short
note explaining why.

In addition, if this pull request fixes a downstream issue, please refer to
test/README.md and add these additional items:

- [ ] 1st commit of any `rhbz#` related PR contains bug reproducer; CI reports FAIL or
- [ ] PR contains automated tests for new functionality and
- [ ] QE has approved reproducer/new tests and
- [ ] Subsequent commits provide bug fixes without modifying the reproducer; CI reports PASS and
- [ ] QE approves this PR; RHBZ status is set to `MODIFIED + Verified=Tested`

Information regarding our GitLab pipeline (Schutzbot):

CI will not be ran automatically if WIP label is applied or the PR is in DRAFT state, instead only
a link will be provided to the pipeline which can then be triggered manually if desired. To run the
CI automatically either switch the PR to ready or apply WIP+test label.

Outside contributors need manual approval from one of the osbuild-composer maintainers.

Schutzbot will only be triggered if all Tests jobs in GitHub workflow succeed.
-->



Patch:
diff --git a/.github/workflows/trigger-gitlab.yml b/.github/workflows/trigger-gitlab.yml
index 899fef7ed..696d4962d 100644
--- a/.github/workflows/trigger-gitlab.yml
+++ b/.github/workflows/trigger-gitlab.yml
@@ -13,7 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SCHUTZBOT_SSH_KEY: ${{ secrets.SCHUTZBOT_SSH_KEY }}
-      SKIP_CI: ${{ (github.event.pull_request.draft == true || contains(github.event.pull_request.labels.*.name, 'WIP')) && !contains(github.event.pull_request.labels.*.name, 'WIP+test') }}
     steps:
       - name: Report status
         uses: haya14busa/action-workflow_run-status@v1
@@ -51,6 +50,30 @@ jobs:
             git checkout ${{ github.event.workflow_run.head_branch }}
           fi
 
+      - name: Download artifacts
+        uses: actions/github-script@v5
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "PR_STATUS"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/PR_STATUS.zip`, Buffer.from(download.data));
+
+      - name: Unzip artifact
+        run: unzip PR_STATUS.zip
+
       - name: Push to gitlab
         run: |
           mkdir -p ~/.ssh
@@ -59,5 +82,6 @@ jobs:
           touch ~/.ssh/known_hosts
           ssh-keyscan -t rsa gitlab.com >> ~/.ssh/known_hosts
           git remote add ci git@gitlab.com:osbuild/ci/osbuild-composer.git
+          SKIP_CI=$(cat SKIP_CI.txt)
           [[ "${SKIP_CI}" == true ]] && PUSH_OPTION='-o ci.variable="SKIP_CI=true"' || PUSH_OPTION=""
           git push -f ${PUSH_OPTION} ci
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49a29bbfc..ecfaa047a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ stages:
   - finish
 
 .base:
+  before_script:
+    - schutzbot/ci_details.sh > ci-details
   after_script:
     - schutzbot/update_github_status.sh update
     - schutzbot/save_journal.sh
@@ -18,6 +20,7 @@ stages:
     paths:
       - journal-log.gpg
       - ci-artifacts
+      - ci-details
       - "*.repo"
       - COMPOSER_NVR
     when: always
diff --git a/internal/distro/rhel86/pipelines.go b/internal/distro/rhel86/pipelines.go
index cdcbd87d5..b2c4b2593 100644
--- a/internal/distro/rhel86/pipelines.go
+++ b/internal/distro/rhel86/pipelines.go
@@ -853,11 +853,7 @@ func ostreeDeployPipeline(
 	))
 	p.AddStage(osbuild.NewOSTreeConfigStage(ostreeConfigStageOptions(repoPath, true)))
 	p.AddStage(osbuild.NewMkdirStage(efiMkdirStageOptions()))
-	kernelOpts := []string{
-		"console=tty0",
-		"console=ttyS0",
-	}
-	kernelOpts = append(kernelOpts, osbuild.GenImageKernelOptions(pt)...)
+	kernelOpts := osbuild.GenImageKernelOptions(pt)
 	p.AddStage(osbuild.NewOSTreeDeployStage(
 		&osbuild.OSTreeDeployStageOptions{
 			OsName: osname,
diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go
index c0b9974f6..948333a03 100644
--- a/internal/distro/rhel90/pipelines.go
+++ b/internal/distro/rhel90/pipelines.go
@@ -848,11 +848,7 @@ func ostreeDeployPipeline(
 	))
 	p.AddStage(osbuild.NewOSTreeConfigStage(ostreeConfigStageOptions(repoPath, true)))
 	p.AddStage(osbuild.NewMkdirStage(efiMkdirStageOptions()))
-	kernelOpts := []string{
-		"console=tty0",
-		"console=ttyS0",
-	}
-	kernelOpts = append(kernelOpts, osbuild.GenImageKernelOptions(pt)...)
+	kernelOpts := osbuild.GenImageKernelOptions(pt)
 	p.AddStage(osbuild.NewOSTreeDeployStage(
 		&osbuild.OSTreeDeployStageOptions{
 			OsName: osname,
diff --git a/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml b/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml
index 3c13dfb7a..3a98e9afc 100644
--- a/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml
+++ b/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml
@@ -29,13 +29,10 @@ data:
         ]
       },
       "editable": true,
-      "fiscalYearStartMonth": 0,
       "gnetId": null,
       "graphTooltip": 0,
-      "id": 219,
-      "iteration": 1638547440887,
+      "iteration": 1647253765879,
       "links": [],
-      "liveNow": false,
       "panels": [
         {
           "collapsed": false,
@@ -130,7 +127,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "1 - sum(increase(image_builder_composer_total_failed_compose_requests[$__range]))/sum(increase(image_builder_composer_total_compose_requests[$__range]))",
+              "expr": "1 - (\n  (\n    sum(increase(image_builder_composer_total_failed_compose_requests[$__range]))\n    /\n    sum(increase(image_builder_composer_total_compose_requests[$__range]))\n  ) OR on() vector(0) # set a fallback if the query result is empty\n)",
               "interval": "",
               "legendFormat": "",
               "refId": "A"
@@ -282,7 +279,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(image_builder_composer_total_compose_requests[$interval])) - sum(rate(image_builder_composer_total_failed_compose_requests[$interval]))",
+              "expr": "(sum(rate(image_builder_composer_total_compose_requests[$interval])) OR on() vector(0)) \n- \n(sum(rate(image_builder_composer_total_failed_compose_requests[$interval])) OR on() vector(0))",
               "hide": false,
               "interval": "",
               "legendFormat": "success/sec",
@@ -290,7 +287,7 @@ data:
             },
             {
               "exemplar": true,
-              "expr": "sum(rate(image_builder_composer_total_failed_compose_requests[$interval]))",
+              "expr": "(sum(rate(image_builder_composer_total_failed_compose_requests[$interval])) OR on() vector(0))",
               "hide": false,
               "interval": "",
               "legendFormat": "errors/sec",
@@ -371,7 +368,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(image_builder_composer_total_failed_compose_requests[$interval]))/sum(rate(image_builder_composer_total_compose_requests[$interval]))",
+              "expr": "(\n  sum(rate(image_builder_composer_total_failed_compose_requests[$interval]))\n  /\n  sum(rate(image_builder_composer_total_compose_requests[$interval]))\n) OR on() vector(0)",
               "interval": "",
               "legendFormat": "",
               "refId": "A"
@@ -465,7 +462,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "28 * 24 * (1 - $stability_slo) / ((sum(rate(image_builder_composer_total_failed_compose_requests[28d]))/ sum(rate(image_builder_composer_total_compose_requests[28d]))) + 0.001)",
+              "expr": "28 * 24 * (1 - $stability_slo)\n/\n(\n  (\n    sum(rate(image_builder_composer_total_failed_compose_requests[28d]))\n    / \n    sum(rate(image_builder_composer_total_compose_requests[28d]))\n  ) OR on() vector(0.01) # set fallback incase the above query result is empty\n)",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -560,11 +557,11 @@ data:
               "mode": "single"
             }
           },
-          "pluginVersion": "8.1.5",
+          "pluginVersion": "8.2.1",
           "targets": [
             {
               "exemplar": true,
-              "expr": "1 - ((1 - sum(increase(image_builder_composer_total_failed_compose_requests[28d]))/sum(increase(image_builder_composer_total_compose_requests[28d]))) - $stability_slo)/ (1 - $stability_slo)",
+              "expr": "1 - (\n  (\n    1 - $stability_slo - (\n      (\n        sum(increase(image_builder_composer_total_failed_compose_requests[28d]))\n        /\n        sum(increase(image_builder_composer_total_compose_requests[28d]))\n      ) OR on() vector(0) # set fallback for empty query result\n    )\n  )\n)\n/\n(1 - $stability_slo)",
               "instant": false,
               "interval": "",
               "intervalFactor": 10,
@@ -1059,7 +1056,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "28 * 24 * (1 - $latency_slo) / (1 - sum(rate(image_builder_composer_http_duration_seconds_bucket{le=\"0.2\"}[$__range]))/sum(rate(image_builder_composer_http_duration_seconds_count[$__range])))",
+              "expr": "28 * 24 * (1 - $latency_slo) \n/\n(\n  1.001 - (\n    (\n      sum(rate(image_builder_composer_http_duration_seconds_bucket{le=\"0.2\"}[$__range]))\n      /\n      sum(rate(image_builder_composer_http_duration_seconds_count[$__range]))\n    ) OR on() vector(1) # set fallback incase the above query result is empty\n  ) \n)",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -1153,11 +1150,11 @@ data:
               "mode": "single"
             }
           },
-          "pluginVersion": "8.1.5",
+          "pluginVersion": "8.2.1",
           "targets": [
             {
               "exemplar": true,
-              "expr": "1 - ((sum(increase(image_builder_composer_http_duration_seconds_bucket{le=\"0.2\"}[28d]))/sum(increase(image_builder_composer_http_duration_seconds_count[28d]))) - $latency_slo)/ (1 - $latency_slo)",
+              "expr": "1 - (\n  (\n    (\n      sum(increase(image_builder_composer_http_duration_seconds_bucket{le=\"0.2\"}[28d]))\n      /\n      sum(increase(image_builder_composer_http_duration_seconds_count[28d]))\n    ) OR on() vector(1)\n  ) - $latency_slo\n)\n/ \n(1 - $latency_slo)",
               "instant": false,
               "interval": "",
               "intervalFactor": 10,
@@ -1172,7 +1169,7 @@ data:
         }
       ],
       "refresh": false,
-      "schemaVersion": 31,
+      "schemaVersion": 30,
       "style": "dark",
       "tags": [],
       "templating": {
@@ -1324,5 +1321,5 @@ data:
       "timezone": "",
       "title": "Image Builder Composer",
       "uid": "image-builder-composer",
-      "version": 3
+      "version": 4
     }
diff --git a/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml b/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
index 34ff8d025..b95ed242f 100644
--- a/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
+++ b/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
@@ -31,7 +31,7 @@ data:
       "editable": true,
       "gnetId": null,
       "graphTooltip": 0,
-      "iteration": 1645525186957,
+      "iteration": 1647253881137,
       "links": [],
       "panels": [
         {
@@ -1356,7 +1356,6 @@ data:
               },
               "mappings": [],
               "max": 1,
-              "min": 3,
               "noValue": "0",
               "thresholds": {
                 "mode": "absolute",
@@ -2743,5 +2742,5 @@ data:
       "timezone": "",
       "title": "Image Builder Worker",
       "uid": "image-builder-worker",
-      "version": 4
+      "version": 5
     }
diff --git a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/get_koji_creds.sh b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/get_koji_creds.sh
index 863bbdd44..20bdcc991 100755
--- a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/get_koji_creds.sh
+++ b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/get_koji_creds.sh
@@ -11,7 +11,7 @@ fi
 
 /usr/local/bin/aws secretsmanager get-secret-value \
   --endpoint-url "${SECRETS_MANAGER_ENDPOINT_URL}" \
-  --secret-id "${KOJI_SERVICE_ACCOUNT_IMAGE_BUILDER_ARN}" | jq -r ".SecretString" > /tmp/koji_credentials.json
+  --secret-id "${KOJI_ACCOUNT_IMAGE_BUILDER_ARN}" | jq -r ".SecretString" > /tmp/koji_credentials.json
 
 KOJIHUB=$(jq -r ".kojihub" /tmp/koji_credentials.json)
 PRINCIPAL=$(jq -r ".principal" /tmp/koji_credentials.json)
diff --git a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/subscription_manager.sh b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/subscription_manager.sh
index 259efebb5..8c62a31b5 100755
--- a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/subscription_manager.sh
+++ b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/subscription_manager.sh
@@ -4,6 +4,11 @@ source /tmp/cloud_init_vars
 
 echo "Subscribing instance to RHN."
 
+if [[ -z "$SUBSCRIPTION_MANAGER_COMMAND_ARN" ]]; then
+  echo "SUBSCRIPTION_MANAGER_COMMAND_ARN not defined, skipping."
+  exit 0
+fi
+
 # Register the instance with RHN.
 # TODO: don't store the command in a secret, only the key/org-id
 /usr/local/bin/aws secretsmanager get-secret-value \
diff --git a/templates/packer/worker.pkr.hcl b/templates/packer/worker.pkr.hcl
index 5524fd312..449329a44 100644
--- a/templates/packer/worker.pkr.hcl
+++ b/templates/packer/worker.pkr.hcl
@@ -69,7 +69,7 @@ build {
     # Apply tags to the resulting AMI/EBS snapshot.
     tags = {
       AppCode = "IMGB-001"
-      Name = "${var.image_name}"
+      Name = "${var.image_name}-fedora-35-x86_64"
       composer_commit = "${var.composer_commit}"
       os = "fedora"
       os_version = "35"
@@ -106,7 +106,7 @@ EOF
     # Apply tags to the resulting AMI/EBS snapshot.
     tags = {
       AppCode = "IMGB-001"
-      Name = "${var.image_name}"
+      Name = "${var.image_name}-fedora-35-aarch64"
       composer_commit = "${var.composer_commit}"
       os = "fedora"
       os_version = "35"


Test patch:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d4ac42d65..98e0129ea 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -136,3 +136,17 @@ jobs:
 
       - name: Run rpmlint
         run: rpmlint rpmbuild/SRPMS/*
+
+  gitlab-ci-helper:
+    name: "Gitlab CI trigger helper"
+    runs-on: ubuntu-latest
+    env:
+      SKIP_CI: ${{ (github.event.pull_request.draft == true || contains(github.event.pull_request.labels.*.name, 'WIP')) && !contains(github.event.pull_request.labels.*.name, 'WIP+test') }}
+    steps:
+      - name: Write PR status
+        run: echo "$SKIP_CI" > SKIP_CI.txt
+      - name: Upload status
+        uses: actions/upload-artifact@v3
+        with:
+          name: PR_STATUS
+          path: SKIP_CI.txt
diff --git a/test/cases/api.sh b/test/cases/api.sh
index e757c71a5..852e6c053 100755
--- a/test/cases/api.sh
+++ b/test/cases/api.sh
@@ -270,6 +270,18 @@ function cleanupAzure() {
   fi
 }
 
+function dump_db() {
+  # Disable -x for these commands to avoid printing the whole result and manifest into the log
+  set +x
+
+  # Make sure we get 3 job entries in the db per compose (depsolve + manifest + build)
+  sudo podman exec osbuild-composer-db psql -U postgres -d osbuildcomposer -c "SELECT * FROM jobs;" | grep "9 rows"
+
+  # Save the result, including the manifest, for the job, straight from the db
+  sudo podman exec osbuild-composer-db psql -U postgres -d osbuildcomposer -c "SELECT result FROM jobs WHERE type='manifest-id-only'" | sudo tee "${ARTIFACTS}/build-result.txt"
+  set -x
+}
+
 WORKDIR=$(mktemp -d)
 KILL_PIDS=()
 function cleanup() {
@@ -289,6 +301,9 @@ function cleanup() {
       ;;
   esac
 
+  # dump the DB here to ensure that it gets dumped even if the test fails
+  dump_db
+
   sudo rm -rf "$WORKDIR"
 
   for P in "${KILL_PIDS[@]}"; do
@@ -503,7 +518,7 @@ else
 fi
 
 # generate a temp key for user tests
-ssh-keygen -t rsa-sha2-512 -f /tmp/usertest -C "usertest" -N ""
+ssh-keygen -t rsa-sha2-512 -f "${WORKDIR}/usertest" -C "usertest" -N ""
 
 function createReqFileAWS() {
   AWS_SNAPSHOT_NAME=${TEST_ID}
@@ -531,11 +546,11 @@ function createReqFileAWS() {
       {
         "name": "user1",
         "groups": ["wheel"],
-        "key": "$(cat /tmp/usertest.pub)"
+        "key": "$(cat "${WORKDIR}/usertest.pub")"
       },
       {
         "name": "user2",
-        "key": "$(cat /tmp/usertest.pub)"
+        "key": "$(cat "${WORKDIR}/usertest.pub")"
       }
     ]
   },
@@ -576,11 +591,11 @@ function createReqFileAWSS3() {
       {
         "name": "user1",
         "groups": ["wheel"],
-        "key": "$(cat /tmp/usertest.pub)"
+        "key": "$(cat "${WORKDIR}/usertest.pub")"
       },
       {
         "name": "user2",
-        "key": "$(cat /tmp/usertest.pub)"
+        "key": "$(cat "${WORKDIR}/usertest.pub")"
       }
     ]
   },
@@ -800,16 +815,6 @@ test "$UPLOAD_STATUS" = "success"
 test "$UPLOAD_TYPE" = "$CLOUD_PROVIDER"
 test $((INIT_COMPOSES+1)) = "$SUBS_COMPOSES"
 
-# Disable -x for these commands to avoid printing the whole result and manifest into the log
-set +x
-
-# Make sure we get 3 job entries in the db per compose (depsolve + manifest + build)
-sudo podman exec osbuild-composer-db psql -U postgres -d osbuildcomposer -c "SELECT * FROM jobs;" | grep "9 rows"
-
-# Save the result, including the manifest, for the job, straight from the db
-sudo podman exec osbuild-composer-db psql -U postgres -d osbuildcomposer -c "SELECT result FROM jobs WHERE type='manifest-id-only'" | sudo tee "${ARTIFACTS}/build-result.txt"
-set -x
-
 #
 # Verify the Cloud-provider specific upload_status options
 #
@@ -977,14 +982,14 @@ function verifyInAWS() {
   _instanceCheck "$_ssh"
 
   # Check access to user1 and user2
-  check_groups=$(ssh -oStrictHostKeyChecking=no -i /tmp/usertest "user1@$HOST" -t 'groups')
+  check_groups=$(ssh -oStrictHostKeyChecking=no -i "${WORKDIR}/usertest" "user1@$HOST" -t 'groups')
   if [[ $check_groups =~ "wheel" ]]; then
    echo "✔️  user1 has the group wheel"
   else
     echo 'user1 should have the group wheel 😢'
     exit 1
   fi
-  check_groups=$(ssh -oStrictHostKeyChecking=no -i /tmp/usertest "user2@$HOST" -t 'groups')
+  check_groups=$(ssh -oStrictHostKeyChecking=no -i "${WORKDIR}/usertest" "user2@$HOST" -t 'groups')
   if [[ $check_groups =~ "wheel" ]]; then
     echo 'user2 should not have group wheel 😢'
     exit 1
diff --git a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
index db1277f4b..f14ea6571 100644
--- a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
@@ -438,8 +438,6 @@
                 "label": "root"
               },
               "kernel_opts": [
-                "console=tty0",
-                "console=ttyS0",
                 "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
               ]
             }
diff --git a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
index dfac934ec..520f2fac7 100644
--- a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
@@ -446,8 +446,6 @@
                 "label": "root"
               },
               "kernel_opts": [
-                "console=tty0",
-                "console=ttyS0",
                 "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
               ]
             }
diff --git a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
index ccd15d445..d93db5e85 100644
--- a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
@@ -428,8 +428,6 @@
                 "label": "root"
               },
               "kernel_opts": [
-                "console=tty0",
-                "console=ttyS0",
                 "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
               ]
             }
diff --git a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
index aa84ddd22..113d8bfa1 100644
--- a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
@@ -442,8 +442,6 @@
                 "label": "root"
               },
               "kernel_opts": [
-                "console=tty0",
-                "console=ttyS0",
                 "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
               ]
             }
diff --git a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
index 48853012b..312c637cf 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
@@ -436,8 +436,6 @@
                 "label": "root"
               },
               "kernel_opts": [
-                "console=tty0",
-                "console=ttyS0",
                 "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
               ]
             }
diff --git a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
index dea914ec7..f25378d0f 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
@@ -444,8 +444,6 @@
                 "label": "root"
               },
               "kernel_opts": [
-                "console=tty0",
-                "console=ttyS0",
                 "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
               ]
             }
diff --git a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
index f3a2c50f6..e6b8d94da 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
@@ -426,8 +426,6 @@
                 "label": "root"
               },
               "kernel_opts": [
-                "console=tty0",
-                "console=ttyS0",
                 "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
               ]
             }
diff --git a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
index e3ad8f5c1..da4e00841 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
@@ -433,8 +433,6 @@
                 "label": "root"
               },
               "kernel_opts": [
-                "console=tty0",
-                "console=ttyS0",
                 "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
               ]
             }
diff --git a/tools/test-case-generators/distro-arch-imagetype-map.json b/tools/test-case-generators/distro-arch-imagetype-map.json
index c4d7620eb..526cb954f 100644
--- a/tools/test-case-generators/distro-arch-imagetype-map.json
+++ b/tools/test-case-generators/distro-arch-imagetype-map.json
@@ -42,6 +42,7 @@
             "edge-commit",
             "edge-container",
             "image-installer",
+            "edge-simplified-installer",
             "vhd",
             "vmdk"
         ],
@@ -52,6 +53,7 @@
             "edge-commit",
             "edge-container",
             "image-installer",
+            "edge-simplified-installer",
             "tar"
         ],
         "ppc64le": [
@@ -158,6 +160,7 @@
             "edge-commit",
             "edge-container",
             "image-installer",
+            "edge-simplified-installer",
             "vhd",
             "vmdk"
         ],
@@ -169,6 +172,7 @@
             "edge-commit",
             "edge-container",
             "image-installer",
+            "edge-simplified-installer",
             "tar"
         ],
         "ppc64le": [
@@ -222,6 +226,7 @@
             "edge-commit",
             "edge-container",
             "image-installer",
+            "edge-simplified-installer",
             "openstack",
             "qcow2",
             "tar",
@@ -234,6 +239,7 @@
             "edge-commit",
             "edge-container",
             "image-installer",
+            "edge-simplified-installer",
             "openstack",
             "qcow2",
             "tar"
@@ -256,6 +262,7 @@
             "edge-commit",
             "edge-container",
             "image-installer",
+            "edge-simplified-installer",
             "vhd",
             "vmdk"
         ],
@@ -266,6 +273,7 @@
             "edge-commit",
             "edge-container",
             "image-installer",
+            "edge-simplified-installer",
             "tar"
         ],
         "ppc64le": [