Skip to content

build: pin FINAL_BASE_IMAGE on a per-arch basis - #6588

Merged
mergify[bot] merged 1 commit into
ceph:develfrom
black-dragon74:fix/arm64-final-base-image
Sep 28, 2026
Merged

mergify[bot] merged 1 commit into
ceph:develfrom
black-dragon74:fix/arm64-final-base-image

Conversation

@black-dragon74

Copy link
Copy Markdown
Member

Describe what this PR does

The FINAL_BASE_IMAGE is a floating tag that always resolved to amd64 (the build arch).

Set it correctly like we do for BASE_IMAGE.

Without this patch, the builds for arm64 would be incorrectly tagged as amd64.

Fixes: #6587

@black-dragon74
black-dragon74 requested review from a team as code owners September 28, 2026 05:43
@mergify mergify Bot added the component/build Issues and PRs related to compiling Ceph-CSI label Sep 28, 2026
@Madhu-1
Madhu-1 requested a review from a team September 28, 2026 05:47
@iPraveenParihar iPraveenParihar added the ci/skip/e2e skip running e2e CI jobs label Sep 28, 2026
@mergify

mergify Bot commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor

Queued — the merge queue status continues in this comment ↓.

@mergify

mergify Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

queue

🛑 This pull request comes from a fork and cannot be rebased on behalf of a user

Details

GitHub refuses an OAuth token on its rebase API for a fork, so rebasing a fork's pull request on behalf of a GitHub user means impersonating that user to force-push the contributor's branch. Mergify does not do that.

Unset update_bot_account on the default queue to keep queueing pull requests from forks: with no account to impersonate, the update rebases through GitHub's API as Mergify, which the installation token is allowed to do. A fork pull request that changes GitHub Actions workflows, or that another GitHub App's bot opened, is the exception: GitHub lets Mergify queue one in place only with an update_bot_account, so a queue that receives those has to run its checks on a draft pull request instead. So is one that changes more than 3000 files: GitHub stops listing a pull request's files there, so Mergify cannot rule out a workflow change and treats it as one. update_method: merge works too, and merges the base branch into the pull request rather than rebasing it.

@iPraveenParihar

Copy link
Copy Markdown
Contributor

@Mergifyio rebase

@mergify

mergify Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

rebase

☑️ Nothing to do, the required conditions are not met

Details
  • any of:
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]

@iPraveenParihar

Copy link
Copy Markdown
Contributor

/queue

@ceph-csi-bot ceph-csi-bot added the ok-to-test Label to trigger E2E tests label Sep 28, 2026
@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.37/nfs

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.34

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.36

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.34

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.35

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.36

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.35

@ceph-csi-bot ceph-csi-bot added ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. and removed ok-to-test Label to trigger E2E tests labels Sep 28, 2026
@mergify mergify Bot removed the ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. label Sep 28, 2026
@iPraveenParihar

Copy link
Copy Markdown
Contributor

@Mergifyio queue

@mergify

mergify Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

queue

🛑 This pull request comes from a fork and cannot be rebased on behalf of a user

Details

GitHub refuses an OAuth token on its rebase API for a fork, so rebasing a fork's pull request on behalf of a GitHub user means impersonating that user to force-push the contributor's branch. Mergify does not do that.

Unset update_bot_account on the default queue to keep queueing pull requests from forks: with no account to impersonate, the update rebases through GitHub's API as Mergify, which the installation token is allowed to do. A fork pull request that changes GitHub Actions workflows, or that another GitHub App's bot opened, is the exception: GitHub lets Mergify queue one in place only with an update_bot_account, so a queue that receives those has to run its checks on a draft pull request instead. So is one that changes more than 3000 files: GitHub stops listing a pull request's files there, so Mergify cannot rule out a workflow change and treats it as one. update_method: merge works too, and merges the base branch into the pull request rather than rebasing it.

@black-dragon74

Copy link
Copy Markdown
Member Author

@Mergifyio queue

@mergify

mergify Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

queue

🛑 This pull request comes from a fork and cannot be rebased on behalf of a user

Details

GitHub refuses an OAuth token on its rebase API for a fork, so rebasing a fork's pull request on behalf of a GitHub user means impersonating that user to force-push the contributor's branch. Mergify does not do that.

Unset update_bot_account on the default queue to keep queueing pull requests from forks: with no account to impersonate, the update rebases through GitHub's API as Mergify, which the installation token is allowed to do. A fork pull request that changes GitHub Actions workflows, or that another GitHub App's bot opened, is the exception: GitHub lets Mergify queue one in place only with an update_bot_account, so a queue that receives those has to run its checks on a draft pull request instead. So is one that changes more than 3000 files: GitHub stops listing a pull request's files there, so Mergify cannot rule out a workflow change and treats it as one. update_method: merge works too, and merges the base branch into the pull request rather than rebasing it.

@Madhu-1

Madhu-1 commented Sep 28, 2026

Copy link
Copy Markdown
Collaborator

@Mergifyio queue

@mergify

mergify Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

queue

🛑 This pull request comes from a fork and cannot be rebased on behalf of a user

Details

GitHub refuses an OAuth token on its rebase API for a fork, so rebasing a fork's pull request on behalf of a GitHub user means impersonating that user to force-push the contributor's branch. Mergify does not do that.

Unset update_bot_account on the default queue to keep queueing pull requests from forks: with no account to impersonate, the update rebases through GitHub's API as Mergify, which the installation token is allowed to do. A fork pull request that changes GitHub Actions workflows, or that another GitHub App's bot opened, is the exception: GitHub lets Mergify queue one in place only with an update_bot_account, so a queue that receives those has to run its checks on a draft pull request instead. So is one that changes more than 3000 files: GitHub stops listing a pull request's files there, so Mergify cannot rule out a workflow change and treats it as one. update_method: merge works too, and merges the base branch into the pull request rather than rebasing it.

@nixpanic

Copy link
Copy Markdown
Member

/queue

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

@Mergifyio rebase

@mergify

mergify Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

rebase

❌ This pull request comes from a fork and cannot be rebased

Details

GitHub refuses an OAuth token on its rebase API for a fork, so rebasing one means impersonating a GitHub user to force-push the contributor's branch. Mergify does not do that.

Use the update action or the @mergifyio update command instead: it brings the pull request up to date by merging the base branch into it, and needs no impersonation. It only has something to do when the pull request is behind its base branch, so if what the branch needs is a linear history, its author has to rebase it themselves.

@mergify

mergify Bot commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor

Merge Queue Status

  • ✅ Entered queue — 2026-09-28 09:48 UTC · Rule: default · triggered by merge protections
  • ✅ Checks passed · in-place
  • ✅ Merged — 2026-09-28 11:13 UTC · at 5af91e2b3dccfa1f402521becb2c49bc00907187 · rebase

This pull request spent 1 hour 25 minutes 11 seconds in the queue, including 1 hour 24 minutes 39 seconds running CI.

Required conditions to merge

The `FINAL_BASE_IMAGE` is a floating tag that always
resolved to amd64 (the build arch).

Set it correctly like we do for `BASE_IMAGE`.

Without this patch, the builds for arm64 would be incorrectly
tagged as amd64.

Fixes: ceph#6587

Signed-off-by: Niraj Yadav <niryadav@redhat.com>
@mergify
mergify Bot force-pushed the fix/arm64-final-base-image branch from 0e778ce to e4a4b62 Compare September 28, 2026 09:48
@ceph-csi-bot ceph-csi-bot added ok-to-test Label to trigger E2E tests and removed queued/rebase labels Sep 28, 2026
@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.37/nfs

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.34

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.35

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.36

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.34

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.35

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.36

@mergify mergify Bot added the queued label Sep 28, 2026
@ceph-csi-bot ceph-csi-bot added ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. and removed ok-to-test Label to trigger E2E tests labels Sep 28, 2026
@mergify mergify Bot removed the ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. label Sep 28, 2026
@mergify
mergify Bot merged commit 5af91e2 into ceph:devel Sep 28, 2026
48 checks passed
@mergify mergify Bot removed the queued label Sep 28, 2026
@nixpanic

Copy link
Copy Markdown
Member

@Mergifyio backport release-v3.18

@mergify

mergify Bot commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor

backport release-v3.18

✅ Backports have been created

Details

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

Labels

backport-to-release-v3.18 ci/skip/e2e skip running e2e CI jobs component/build Issues and PRs related to compiling Ceph-CSI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

v3.18.0 container image missing arm64

5 participants