Backport to 16.3: Geo: Avoid getting resources stuck in Queued
What does this MR do and why?
Describe in detail what merge request is being backported and why
Avoids getting resources stuck in Queued.
See original 16.5 merge request !133782 (merged)
(cherry picked from commit 9f473420)
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch. -
The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes). -
This MR has a severity label assigned (if applicable). -
This MR has been approved by a maintainer (only one approval is required). -
Ensure the e2e:package-and-test-ee
job has either succeeded or been approved by a Software Engineer in Test. => https://gitlab.com/gitlab-org/gitlab/-/pipelines/1036542986
Note to the merge request author and maintainer
If you have questions about the patch release process, please:
- Refer to the patch release runbook for engineers and maintainers for guidance.
- Ask questions on the
#releases
Slack channel (internal only).
Merge request reports
Activity
changed milestone to %16.5
assigned to @mkozono
changed milestone to %16.3
removed pipeline:mr-approved label
removed workflowproduction label
2 Warnings Backporting to older releases requires an exception request process The e2e:package-and-test-ee
job needs to succeed or have approval from a Software Engineer in Test.
Read the "QA e2e:package-and-test-ee" section for more details.1 Message CHANGELOG missing: If you want to create a changelog entry for GitLab FOSS, add the
Changelog
trailer to the commit message you want to add to the changelog.If you want to create a changelog entry for GitLab EE, also add the
EE: true
trailer to your commit message.If this merge request doesn't need a CHANGELOG entry, feel free to ignore this message.
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend euko
(UTC+9, 19 hours ahead of
@mkozono
)acook.gitlab
(UTC-4, 6 hours ahead of
@mkozono
)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
QA
e2e:package-and-test-ee
@mkozono, the
package-and-test
job must complete before merging this merge request.*If there are failures on the
package-and-test
pipeline, ping your team's associated Software Engineer in Test (SET) to confirm the failures are unrelated to the merge request. If there's no SET assigned, ask for assistance on the#quality
Slack channel.If needed, you can retry the
danger-review
job that generated this comment.Generated by
Dangermentioned in issue #427792 (closed)
Allure report
allure-report-publisher
generated test report!e2e-package-and-test:
test report for c49f7734expand test summary
+--------------------------------------------------------------+ | suites summary | +---------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +---------+--------+--------+---------+-------+-------+--------+ | Systems | 8 | 0 | 0 | 0 | 8 | ✅ | | Create | 134 | 1 | 18 | 0 | 153 | ❌ | +---------+--------+--------+---------+-------+-------+--------+ | Total | 142 | 1 | 18 | 0 | 161 | ❌ | +---------+--------+--------+---------+-------+-------+--------+
e2e-test-on-gdk:
test report for c49f7734expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Create | 38 | 0 | 0 | 0 | 38 | ✅ | | Verify | 8 | 0 | 0 | 0 | 8 | ✅ | | Plan | 47 | 0 | 0 | 0 | 47 | ✅ | | Data Stores | 20 | 0 | 0 | 0 | 20 | ✅ | | Govern | 34 | 0 | 0 | 1 | 34 | ❗ | | Manage | 12 | 0 | 1 | 0 | 13 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 159 | 0 | 1 | 1 | 160 | ❗ | +-------------+--------+--------+---------+-------+-------+--------+
changed milestone to %16.5
added missed:16.3 label
- Resolved by Reuben Pereira
https://gitlab.com/gitlab-org/gitlab/-/jobs/5292326680
$ scripts/build_gdk_image ** Building GDK image with GDK sha: '' ** #0 building with "strange_sammet" instance using docker-container driver #1 [internal] booting buildkit #1 pulling image moby/buildkit:buildx-stable-1 #1 pulling image moby/buildkit:buildx-stable-1 2.1s done #1 creating container buildx_buildkit_strange_sammet0 #1 creating container buildx_buildkit_strange_sammet0 1.8s done #1 DONE 3.9s #2 [internal] load build definition from Dockerfile.gdk #2 transferring dockerfile: 3.69kB done #2 DONE 0.0s #3 [auth] gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:pull token for registry.gitlab.com #3 DONE 0.0s #4 [internal] load metadata for registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:14fa752a80df21f840fc48f4be8561bee21b78886ac718652582fdd788d34c32 #4 ERROR: registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:14fa752a80df21f840fc48f4be8561bee21b78886ac718652582fdd788d34c32: not found ------ > [internal] load metadata for registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:14fa752a80df21f840fc48f4be8561bee21b78886ac718652582fdd788d34c32: ------ Dockerfile.gdk:1 -------------------- 1 | >>> FROM registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:14fa752a80df21f840fc48f4be8561bee21b78886ac718652582fdd788d34c32 2 | 3 | ENV GITLAB_LICENSE_MODE=test \ -------------------- ERROR: failed to solve: registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:14fa752a80df21f840fc48f4be8561bee21b78886ac718652582fdd788d34c32: registry.gitlab.com/gitlab-org/gitlab-development-kit/asdf-bootstrapped-verify:main@sha256:14fa752a80df21f840fc48f4be8561bee21b78886ac718652582fdd788d34c32: not found Cleaning up project directory and file based variables 00:01 ERROR: Job failed: exit code 1
I see that that image still does not exist https://gitlab.com/gitlab-org/gitlab-development-kit/container_registry/1919992?orderBy=NAME&sort=asc&search[]=14fa752a80df21f840fc48f4be8561bee21b78886ac718652582fdd788d34c32&search[]=
- Resolved by Reuben Pereira
@10io Would you please review this backport of !133782 (merged) to 16.3? There were no conflicts or changes.
requested review from @10io
mentioned in merge request !134262 (closed)
removed review request for @10io
- Resolved by Michael Kozono
@10io
, thanks for approving this merge request.This is the first time the merge request has been approved. Please ensure the
e2e:package-and-test-ee
job has succeeded. If there is a failure, a Software Engineer in Test (SET) needs to confirm the failures are unrelated to the merge request. If there's no SET assigned to this team, ask for assistance on the#quality
Slack channel.
mentioned in merge request !134587 (closed)
mentioned in merge request gitlab-development-kit!3427 (merged)
mentioned in issue #428851 (closed)
changed milestone to %16.6
added missed:16.5 label
mentioned in issue #426778 (closed)
2 Warnings Backporting to older releases requires an exception request process The e2e:package-and-test-ee
job needs to succeed or have approval from a Software Engineer in Test.
Read the "QA e2e:package-and-test-ee" section for more details.1 Message CHANGELOG missing: If you want to create a changelog entry for GitLab FOSS, add the
Changelog
trailer to the commit message you want to add to the changelog.If you want to create a changelog entry for GitLab EE, also add the
EE: true
trailer to your commit message.If this merge request doesn't need a CHANGELOG entry, feel free to ignore this message.
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend @wandering_person
(UTC+7, 17 hours ahead of
@mkozono
)@vij
(UTC+1, 11 hours ahead of
@mkozono
)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
QA
e2e:package-and-test-ee
@mkozono, the
package-and-test
job must complete before merging this merge request.*If there are failures on the
package-and-test
pipeline, ping your team's associated Software Engineer in Test (SET) to confirm the failures are unrelated to the merge request. If there's no SET assigned, ask for assistance on the#quality
Slack channel.If needed, you can retry the
danger-review
job that generated this comment.Generated by
Dangermentioned in merge request !134718 (closed)
Since the pipeline is now green (after merging of !135401 (merged)), and we have maintainer approval, I'm going to go ahead and merge this backport.
mentioned in commit 131cb84e