Skip to content

Backport of services: update check IDs from group service hook on update into release/1.11.x#27476

Merged
tgross merged 1 commit intorelease/1.11.xfrom
backport/NMD1054-script-check-updates/accurately-internal-gelding
Feb 6, 2026
Merged

Backport of services: update check IDs from group service hook on update into release/1.11.x#27476
tgross merged 1 commit intorelease/1.11.xfrom
backport/NMD1054-script-check-updates/accurately-internal-gelding

Conversation

@hc-github-team-nomad-core
Copy link
Contributor

Backport

This PR is auto-generated from #27466 to be assessed for backporting due to the inclusion of the label backport/1.11.x.

The below text is copied from the body of the original PR.


In #27453 we fixed a bug in script check hook interpolation by recording the check IDs for each check in the group service hook and then passing that to the script check hook via alloc hook resources. But this change did not account for checks being updated in-place, so the script check hook reads the old check IDs and fails. This was caught by nightly E2E testing.

Record the updated check IDs in the group service hook as well. Expand the group service tests to include updating the checks.

Ref: #27453
Ref: https://hashicorp.atlassian.net/browse/NMD-1054
Ref: https://github.com/hashicorp/nomad-e2e/actions/runs/21699934682/job/62586402991

Testing & Reproduction steps

In addition to the unit tests above, you can exercise this code with the jobs in the E2E test:

  • nomad job run ./checks_group.nomad
  • (see checks 2 and 3 failing)
  • nomad alloc exec -job group_check /bin/sh -c 'touch /tmp/${NOMAD_ALLOC_ID}-alive-2b`
  • (see check 2 start passing; 3 is intended to never pass)
  • nomad job run ./checks_group_update.nomad
  • (see check 1 and 2 still passing)

Contributor Checklist

  • Changelog Entry If this PR changes user-facing behavior, please generate and add a
    changelog entry using the make cl command.
  • Testing Please add tests to cover any new functionality or to demonstrate bug fixes and
    ensure regressions will be caught.
  • Documentation If the change impacts user-facing functionality such as the CLI, API, UI,
    and job configuration, please update the Nomad product documentation, which is stored in the
    web-unified-docs repo. Refer to the web-unified-docs contributor guide for docs guidelines.
    Please also consider whether the change requires notes within the upgrade
    guide
    . If you would like help with the docs, tag the nomad-docs team in this PR.

Reviewer Checklist

  • Backport Labels Please add the correct backport labels as described by the internal
    backporting document.
  • Commit Type Ensure the correct merge method is selected which should be "squash and merge"
    in the majority of situations. The main exceptions are long-lived feature branches or merges where
    history should be preserved.
  • Enterprise PRs If this is an enterprise only PR, please add any required changelog entry
    within the public repository.
  • If a change needs to be reverted, we will roll out an update to the code within 7 days.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.


Overview of commits

Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

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

LGTM

Failing test is due to #27477 and not anything in this PR.

@tgross tgross merged commit c6ddd30 into release/1.11.x Feb 6, 2026
30 of 31 checks passed
@tgross tgross deleted the backport/NMD1054-script-check-updates/accurately-internal-gelding branch February 6, 2026 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants