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

docker: Add a --php option to jetpack docker phpunit #32979

Merged
merged 2 commits into from
Sep 26, 2023

Conversation

anomiex
Copy link
Contributor

@anomiex anomiex commented Sep 11, 2023

Fixes #32914

Proposed changes:

To make it easier to run tests locally with a specified version of PHP.

This turns out to be a bit more complex than it sounds, as we need to be able to install the necessary version of PHP inside the container and we need to make sure the correct versions of Composer deps (particularly phpunit) are installed too. And then use those rather than whatever is in the monorepo install.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

#32914
#32929 (comment)

Does this pull request change what data or activity we track or use?

No

Testing instructions:

  • Temporarily change
    image: automattic/jetpack-wordpress-dev:latest
    to refer to ghcr.io/automattic/jetpack-wordpress-dev:pr-32979 and restart your docker env (jetpack docker stop && jetpack docker up -d).
  • Then try jetpack docker phpunit --php=7.0, or jetpack docker phpunit-crm --php=7.2

To make it easier to run tests locally with a specified version of PHP.

This turns out to be a bit more complex than it sounds, as we need to be
able to install the necessary version of PHP inside the container and we
need to make sure the correct versions of Composer deps (particularly
phpunit) are installed too. And then use those rather than whatever is
in the monorepo install.
@anomiex anomiex added [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it [Status] Proposal [Pri] Normal labels Sep 11, 2023
@anomiex anomiex self-assigned this Sep 11, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 11, 2023

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta > Jetpack and enable the try/docker-jetpack-phpunit-php-version branch.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack try/docker-jetpack-phpunit-php-version
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@github-actions github-actions bot added [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Tests] Includes Tests [Tools] Development CLI The tools/cli to assist during JP development. Docker labels Sep 11, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 11, 2023

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks (other than "Required review") appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.


Jetpack plugin:

  • Next scheduled release: October 10, 2023.
  • Scheduled code freeze: October 9, 2023.

Copy link
Member

@ice9js ice9js left a comment

Choose a reason for hiding this comment

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

Overall, I'd say this looks solid for a first pass and would already be a huge improvement. In terms of fine tuning it, I see two opportunities, but we can work on those in separate PRs:

  • How about only displaying the headers for PHP/Composer install unless -v/verbose mode is set, to make things a tiny bit cleaner? I'm also ok if we don't do this, since you'd only have to go through it once per container.
  • Can we rely on PHPUnit's PHAR releases instead of having it as a composer dependency? I mean, I wouldn't mind keeping the latest in composer and having PHARs for the older versions but my concern is that'd create a conflict with the autoloader. The goal here would be to eliminate the need to mess with dependencies/composer for unit testing altogether.

Let me know what you think and I think we can start working on getting it merged :)

@anomiex
Copy link
Contributor Author

anomiex commented Sep 25, 2023

  • How about only displaying the headers for PHP/Composer install unless -v/verbose mode is set, to make things a tiny bit cleaner? I'm also ok if we don't do this, since you'd only have to go through it once per container.

That could turn out to be confusing, as phpunit also has a -v option.

  • Can we rely on PHPUnit's PHAR releases instead of having it as a composer dependency? I mean, I wouldn't mind keeping the latest in composer and having PHARs for the older versions but my concern is that'd create a conflict with the autoloader. The goal here would be to eliminate the need to mess with dependencies/composer for unit testing altogether.

If PHPUnit were the only thing, probably. Although it would be more complex as we'd need to figure out the appropriate PHPUnit version to download from the PHP version instead of letting Composer handle it.

But for Jetpack we also need to get an appropriate version of johnkary/phpunit-speedtrap, and at some point for CRM we might need to get an appropriate version of the codeception packages they use, etc.

And we also need to not break when the lock file contains too-new versions of changelogger's symfony deps even though they're almost certainly not used during the tests.

Copy link
Member

@ice9js ice9js left a comment

Choose a reason for hiding this comment

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

As we already talked about, this seems to be installing dependencies separately for each PHP version so while we can't skip composer install, at least it should mess up the project dependencies too much once you're done testing.

Let's get this out :)

@anomiex anomiex enabled auto-merge (squash) September 26, 2023 18:35
@anomiex anomiex merged commit 8cff793 into trunk Sep 26, 2023
53 of 54 checks passed
@anomiex anomiex deleted the try/docker-jetpack-phpunit-php-version branch September 26, 2023 21:28
@github-actions github-actions bot added this to the jetpack/12.6.2 milestone Sep 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Docker [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Pri] Normal [Status] Proposal [Tests] Includes Tests [Tools] Development CLI The tools/cli to assist during JP development. [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docker Feature Request: Easy ability to change php versions for unit tests
2 participants