Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove CI module and add a dependency on datadog-ci gem #3128

Merged
merged 3 commits into from
Sep 15, 2023

Conversation

anmarchenko
Copy link
Member

@anmarchenko anmarchenko commented Sep 13, 2023

What does this PR do?
Phase 1 of the CI migration:

  • remove the CI module, corresponding specs and sigs
  • add datadog-ci to the gemspec as runtime dependency
  • remove cucumber appraisals
  • remove minitest and rspec deps from the contrib appraisal
  • update lockfiles
  • add datadog-ci to lib-injection scripts

Motivation:
Remove code duplication between gems

Additional Notes:
Not that it is a new runtime dependency I changed host_inject.rb script to install datadog-ci here:
https://github.com/DataDog/dd-trace-rb/pull/3128/files#diff-112f50906c11b7190b1561f372bd7298abe32cda4be0054ced470a584cffb7d3R66

Is there a way to test this? cc @TonyCTHsu

How to test the change?

git clone https://github.com/DataDog/test-environment

cd test-environment

yarn

cd dd-trace-rb/jekyll
bundle add ddtrace --git "https://github.com/DataDog/dd-trace-rb.git" --branch "anmarchenko/migrate_ci_phase_1" --skip-install
bundle install --path .bundle
cd ../..

yarn test dd-trace-rb/jekyll.test.js

cd dd-trace-rb/devdocs
bundle add ddtrace --git "https://github.com/DataDog/dd-trace-rb.git" --branch "anmarchenko/migrate_ci_phase_1" --skip-install
bundle install --path .bundle
cd ../..

yarn test dd-trace-rb/devdocs.test.js

For Datadog employees:

  • If this PR touches code that signs or publishes builds or packages, or handles
    credentials of any kind, I've requested a review from @DataDog/security-design-and-guidance.
  • This PR doesn't touch any of that.

Unsure? Have a question? Request a review!

@github-actions github-actions bot added the ci-app CI product for test suite instrumentation label Sep 13, 2023
@codecov-commenter
Copy link

codecov-commenter commented Sep 13, 2023

Codecov Report

Merging #3128 (430aa03) into master (7ab178d) will decrease coverage by 0.03%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3128      +/-   ##
==========================================
- Coverage   98.17%   98.14%   -0.03%     
==========================================
  Files        1326     1281      -45     
  Lines       75575    73715    -1860     
  Branches     3506     3423      -83     
==========================================
- Hits        74192    72347    -1845     
+ Misses       1383     1368      -15     

see 46 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@marcotc
Copy link
Member

marcotc commented Sep 13, 2023

Looking good! 👍

@TonyCTHsu
Copy link
Contributor

Perhaps we should change gemspec to add runtime dependency for ci ?

@anmarchenko
Copy link
Member Author

@TonyCTHsu didn't I add it to gemspec? I think it is here https://github.com/DataDog/dd-trace-rb/pull/3128/files#diff-8b1801e03e9a166eea28410efc558b347e0b4a3bc03ab6c7283afa4479e88756R72

and all the regenerated gemfiles for appraisals now show datadog-ci (0.1.0)

@anmarchenko anmarchenko force-pushed the anmarchenko/migrate_ci_phase_1 branch from babac4a to 6dd44c6 Compare September 14, 2023 10:20
@anmarchenko anmarchenko marked this pull request as ready for review September 14, 2023 11:22
@anmarchenko anmarchenko requested a review from a team September 14, 2023 11:22
@anmarchenko anmarchenko force-pushed the anmarchenko/migrate_ci_phase_1 branch from cf14e72 to ec58040 Compare September 14, 2023 11:35
@TonyCTHsu
Copy link
Contributor

🕶️ I was blind

@anmarchenko anmarchenko force-pushed the anmarchenko/migrate_ci_phase_1 branch from bb4970a to 430aa03 Compare September 15, 2023 07:27
@anmarchenko anmarchenko merged commit 16e11eb into master Sep 15, 2023
@anmarchenko anmarchenko deleted the anmarchenko/migrate_ci_phase_1 branch September 15, 2023 07:50
@github-actions github-actions bot added this to the 1.15.0 milestone Sep 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-app CI product for test suite instrumentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants