Skip to content

ci: move one-pipeline jobs to package child pipeline#3688

Merged
Leiyks merged 1 commit intomasterfrom
leiyks/fix-ci-one-pipeline-clean
Mar 5, 2026
Merged

ci: move one-pipeline jobs to package child pipeline#3688
Leiyks merged 1 commit intomasterfrom
leiyks/fix-ci-one-pipeline-clean

Conversation

@Leiyks
Copy link
Copy Markdown
Contributor

@Leiyks Leiyks commented Mar 4, 2026

Summary

  • Moves validate_supported_configurations_v2_local_file and update_central_configurations_version_range_v2 from .gitlab-ci.yml to generate-package.php (the package child pipeline)
  • Removes all SKIP_SHARED_PIPELINE workarounds from the parent pipeline

Context

Commit a3409cd78 added - local: .gitlab/one-pipeline.locked.yml to the parent pipeline (.gitlab-ci.yml) to get job templates needed by two supported-configurations validation jobs. This accidentally imported all shared-pipeline jobs (package-oci, promote-oci-*, requirements_json_test, etc.) into the parent pipeline, causing cascading failures.

Previous PRs #3679, #3682 and open PR #3687 applied SKIP_SHARED_PIPELINE band-aids to suppress those jobs. This PR addresses the root cause instead:

generate-package.php already includes one-pipeline.locked.yml, so the two concrete jobs naturally belong there. The parent pipeline no longer includes one-pipeline.locked.yml at all, so no suppression is needed.

Supersedes #3687.

Test plan

  • Verify package-trigger child pipeline runs validate_supported_configurations_v2_local_file and update_central_configurations_version_range_v2
  • Verify package-oci, promote-oci-*, and requirements_json_test no longer appear in the parent pipeline
  • Verify nightly/scheduled pipelines no longer fail with unexpected job failures

@Leiyks Leiyks requested a review from a team as a code owner March 4, 2026 15:50
@datadog-datadog-prod-us1-2
Copy link
Copy Markdown

datadog-datadog-prod-us1-2 Bot commented Mar 4, 2026

⚠️ Tests

Fix all issues with BitsAI or with Cursor

⚠️ Warnings

🧪 1028 Tests failed

testSearchPhpBinaries from integration.DDTrace\Tests\Integration\PHPInstallerTest (Datadog) (Fix with Cursor)
Risky Test
phpvfscomposer://tests/vendor/phpunit/phpunit/phpunit:52
testSimplePushAndProcess from laravel-58-test.DDTrace\Tests\Integrations\Laravel\V5_8\QueueTest (Datadog) (Fix with Cursor)
Risky Test
phpvfscomposer://tests/vendor/phpunit/phpunit/phpunit:97
testSimplePushAndProcess from laravel-8x-test.DDTrace\Tests\Integrations\Laravel\V8_x\QueueTest (Datadog) (Fix with Cursor)
DDTrace\Tests\Integrations\Laravel\V8_x\QueueTest::testSimplePushAndProcess
Test code or tested code printed unexpected output: spanLinksTraceId: 69a85b8600000000b19ddaa4868dc261
tid: 69a85b8600000000
hexProcessTraceId: b19ddaa4868dc261
hexProcessSpanId: df7a129aa3075d66
processTraceId: 12798626116223746657
processSpanId: 16103203872986062182
View all

ℹ️ Info

❄️ No new flaky tests detected

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: e9c3bd0 | Docs | Datadog PR Page | Was this helpful? React with 👍/👎 or give us feedback!

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Mar 4, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 62.17%. Comparing base (988edd2) to head (e9c3bd0).
⚠️ Report is 46 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3688      +/-   ##
==========================================
- Coverage   62.20%   62.17%   -0.03%     
==========================================
  Files         141      141              
  Lines       13352    13352              
  Branches     1746     1746              
==========================================
- Hits         8305     8302       -3     
- Misses       4256     4259       +3     
  Partials      791      791              

see 2 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 988edd2...e9c3bd0. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Instead of including one-pipeline.locked.yml in the parent pipeline
(which caused package-oci and other shared-pipeline jobs to leak into
the parent), move the two supported-configurations validation jobs to
generate-shared.php where the shared-pipeline include belongs.

This removes all SKIP_SHARED_PIPELINE workarounds that were added as
a band-aid in #3679, #3682, and supersedes #3687.

The validate_supported_configurations_v2_local_file and
update_central_configurations_version_range_v2 jobs now run in the
shared-trigger child pipeline (shared-gen.yml), which includes
one-pipeline.locked.yml for the required job templates.
@Leiyks Leiyks force-pushed the leiyks/fix-ci-one-pipeline-clean branch from 7594851 to e9c3bd0 Compare March 4, 2026 16:04
@Leiyks Leiyks changed the title ci: move one-pipeline jobs to shared child pipeline ci: move one-pipeline jobs to package child pipeline Mar 4, 2026
Copy link
Copy Markdown
Collaborator

@bwoebi bwoebi left a comment

Choose a reason for hiding this comment

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

Much safer, thanks!

@Leiyks Leiyks merged commit eebb4fe into master Mar 5, 2026
2055 of 2060 checks passed
@Leiyks Leiyks deleted the leiyks/fix-ci-one-pipeline-clean branch March 5, 2026 13:26
@github-actions github-actions Bot added this to the 1.17.0 milestone Mar 5, 2026
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.

3 participants