Skip to content

DLPX-98112 linux-kernel-generic: rebase Delphix patchset onto Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1 - #57

Merged
lyriclake merged 0 commit into
developfrom
projects/kernel-merge-generic-7.0-7.0.0-28.28_24.04.1
Aug 7, 2026
Merged

DLPX-98112 linux-kernel-generic: rebase Delphix patchset onto Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1#57
lyriclake merged 0 commit into
developfrom
projects/kernel-merge-generic-7.0-7.0.0-28.28_24.04.1

Conversation

@lyriclake

@lyriclake lyriclake commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Rebases the Delphix patchset onto Ubuntu tag Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1, replacing the previous base
Ubuntu-hwe-6.17-6.17.0-40.40_24.04.1. Recreates the rebase that linux-pkg/develop/update-package/linux-kernel-generic failed to complete.

Field Value
Upstream tag Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1 (917185778ef2b3cb674c703dfd055eb0c4af67de)
Previous base Ubuntu-hwe-6.17-6.17.0-40.40_24.04.1 (063d17a50448cbb5ef703221a62f6af6d1fb78d1)
Patchset 9 patches (0 dropped of 9)
Conflicts resolved 1
Jira DLPX-98112

Note: GitHub will show "This branch has conflicts that must be resolved" and
a diff against the whole Ubuntu bump. Both are expected: this branch does not
descend from develop — the kernel forks are rebased onto each new
Ubuntu tag with git cherry-pick, not merged. Review the patchset commits, not
the aggregate diff. Landing is a force-push, not a GitHub merge.

8f4441107409 — Extract PKG_ABI from mutated string

Conflicting: include/asm-generic/mshyperv.h
Upstream cause: 56f727d2cc7aUBUNTU: SAUCE: (no-up) hv: Supply vendor ID and package ABI
Verdict: RE_APPLY — Ubuntu SAUCE relocated the #ifndef PKG_ABI block from before hv_do_rep_hypercall() to after it while re-applying the SAUCE stack onto the 7.0 mainline; content unchanged. New upstream still defines PKG_ABI as a bare unquoted integer, so the Delphix ABI-string mutation handling is still needed. Ported the same string-mutation logic to the relocated position verbatim.

Testing Done

ab-pre-push build #14705: FAILURE

ab-pre-push build #14718: IN PROGRESS

ab-pre-push build #14718: FAILURE

ab-pre-push build #14718: completed

  • dx-integration-tests rerun #36269: SUCCESS.
  • upgrade-testing rerun #4613blackbox-chained #9570: UNSTABLE — 37/46 sub-tests failed, all cascading from a single root cause: the appliance's management stack failed to restart after power-cycling within the 897s timeout during initial_setup_tests::test_setup_swap, which then failed every dependent test (admin profile setup, virtualization SDK install, upgrade request/pre tests). This is an infra/environment-recovery issue, not a regression from the kernel rebase or either fix.
  • Reran again, reusing the same build's artifacts: upgrade-testing #4618 (image: appliance-build » pre-push #7152's upgrade artifact). Result recorded below.

upgrade-testing rerun #4618blackbox-chained #9575: FAILURE (progress, but same infra pattern)

9/46 sub-tests failed (down from 37/46 last time — the management-stack-restart timeout from the last run didn't recur). All 9 failures trace to a single root cause: SSH/connectivity timeouts to the test appliance starting at test_upload_and_delete_upgrade_image ("management stack did not come up in 300s"), cascading through stop_at_failure dependencies in upgrade_basic_pre/upgrade_pre.

Notably, linux-kernel-aws's rerun (#72) hit the exact same 9 tests, same root cause, in parallel — two unrelated kernel patchsets failing identically points to a shared DCenter/network infra issue at the time, not either kernel rebase.

Reran again reusing the same image: upgrade-testing #4622. Result recorded below.

upgrade-testing rerun #4622blackbox-chained #9579: UNSTABLE (effectively a clean pass)

0/97 sub-tests failed. The only two non-passes were skips unrelated to this rebase:

  • test_host_cacert_after_upgrade — "No host cert was stored which is required for this test to run" (pre-existing test-environment condition).
  • test_validate_mssql_backup_and_validate_vdbs_replication_target — subprocess failure on the replication target, matched known bug DLPX-98231.

Neither implicates the kernel rebase. This clears the infra signature from the last two rounds (management-stack-restart timeout, then SSH/connectivity timeouts to the test appliance during setup) — it did not recur here. Test stage for generic is now green. Compile stage was already confirmed (appliance-build » pre-push #7152: SUCCESS). No further reruns needed on this platform.

linux-kernel-aws's parallel rerun (#72) still hit an SSH connectivity timeout on its next round, but during a different test/stage than the prior rounds (test_upgrade_linux_system, mid-upgrade, not test_upload_and_delete_upgrade_image in setup) — see that PR for the full breakdown and outstanding rerun.

@lyriclake lyriclake changed the title linux-kernel-generic: rebase Delphix patchset onto Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1 DLPX-98112 linux-kernel-generic: rebase Delphix patchset onto Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1 Aug 4, 2026

@prakashsurya prakashsurya left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, pending successful ab-pre-push.

@lyriclake

Copy link
Copy Markdown
Contributor Author

Testing status update

ab-pre-push build #14718: completed

  • Build: https://selfservice-jenkins.eng-tools-prd.aws.delphixcloud.com/job/appliance-build-orchestrator-pre-push/14718/
  • Tested: linux-kernel-generic@e92af378a006, linux-pkg@065c38acf7f7 (linux-pkg#405), zfs@e62b28d4bbc4 (zfs#2305) (against develop)
  • Compile stage: SUCCESSappliance-build » develop » pre-push #7152 (both fixes landed cleanly).
  • dx-integration-tests rerun #36269: SUCCESS.
  • upgrade-testing rerun #4613blackbox-chained #9570: UNSTABLE — 37/46 sub-tests failed, all cascading from a single root cause: the appliance's management stack failed to restart after power-cycling within the 897s timeout during initial_setup_tests::test_setup_swap, which then failed every dependent test (admin profile setup, virtualization SDK install, upgrade request/pre tests). This is an infra/environment-recovery issue, not a regression from the kernel rebase or either fix.
  • Reran again, reusing the same build's artifacts: upgrade-testing #4618 (image: appliance-build » pre-push #7152's upgrade artifact). IN PROGRESS.

Will record the final result once it finishes.

@lyriclake

Copy link
Copy Markdown
Contributor Author

upgrade-testing rerun #4618 → blackbox-chained #9575: FAILURE (progress, but same infra pattern)

9/46 sub-tests failed (down from 37/46 last time — the management-stack-restart timeout from the last run didn't recur). All 9 failures trace to a single root cause: SSH/connectivity timeouts to the test appliance starting at test_upload_and_delete_upgrade_image ("management stack did not come up in 300s"), cascading through stop_at_failure dependencies in upgrade_basic_pre/upgrade_pre.

Notably, linux-kernel-aws's rerun (#72) hit the exact same 9 tests, same root cause, in parallel — two unrelated kernel patchsets failing identically points to a shared DCenter/network infra issue at the time, not either kernel rebase.

Reran again reusing the same image: upgrade-testing #4622. IN PROGRESS.

@lyriclake

Copy link
Copy Markdown
Contributor Author

upgrade-testing rerun #4622 → blackbox-chained #9579: UNSTABLE (effectively a clean pass)

0/97 sub-tests failed. The only two non-passes were skips unrelated to this rebase:

  • test_host_cacert_after_upgrade — "No host cert was stored which is required for this test to run" (pre-existing test-environment condition).
  • test_validate_mssql_backup_and_validate_vdbs_replication_target — subprocess failure on the replication target, matched known bug DLPX-98231.

Neither implicates the kernel rebase. This clears the infra signature from the last two rounds (management-stack-restart timeout, then SSH/connectivity timeouts to the test appliance during setup) — it did not recur here. Test stage for generic is now green; compile stage was already confirmed (appliance-build » pre-push #7152: SUCCESS). No further reruns needed on this platform.

linux-kernel-aws's parallel rerun (#72) still hit an SSH connectivity timeout, but during a different test/stage than the prior rounds (test_upgrade_linux_system, mid-upgrade, not test_upload_and_delete_upgrade_image in setup) — see that PR for the full breakdown and the open question on whether to rerun once more.

@lyriclake
lyriclake merged commit e92af37 into develop Aug 7, 2026
2 of 4 checks passed
@lyriclake
lyriclake deleted the projects/kernel-merge-generic-7.0-7.0.0-28.28_24.04.1 branch August 7, 2026 19:39
@lyriclake

Copy link
Copy Markdown
Contributor Author

Landed on develop as e92af378a006c6b42046924e21370d3ccd7e9b5e via force-push (rebased patchset — the kernel forks cannot be merged through GitHub, see the PR body). Closing manually.

Overridden gates at land time (explicitly confirmed by requester):

  • Approval: reviewDecision was REVIEW_REQUIRED, but one APPROVED review exists (prakashsurya); repo is transitioning to a single-review policy.
  • Checks: jenkinsci/appliance-build-orchestrator and jenkinsci/build-package showed stale FAILURE from before fix PRs (linux-pkg#405, zfs#2305) landed; Testing Done log confirms a later green build (appliance-build » pre-push #7152: SUCCESS) and clean test rerun with those fixes included.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants