Remove Varnish 4/5 support #38052

gquintard · 2023-10-09T00:59:17Z

Description (*)

Varnish 6.0 is half a decade old. 4.x and 5.x have been EOL'd years ago and there shouldn't be any more distribution carrying those, there's no good reason to keep them around.

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
All automated tests passed successfully (all builds are green)

Resolved issues:

resolves [Issue] Remove Varnish 4/5 support #38304: Remove Varnish 4/5 support

m2-assistant · 2023-10-09T00:59:20Z

Hi @gquintard. Thank you for your contribution!
Here are some useful tips on how you can test your changes using Magento test environment.

Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

@magento run all tests - run or re-run all required tests against the PR changes
@magento run <test-build(s)> - run or re-run specific test build(s)
For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names.

Allowed build names are:

Database Compare
Functional Tests CE
Functional Tests EE
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests
Semantic Version Checker

You can find more information about the builds here
ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.

For more details, review the Code Contributions documentation.
Join Magento Community Engineering Slack and ask your questions in #github channel.

ihor-sviziev · 2023-10-09T16:11:11Z

LGTM, but let's run the tests
@magento run all tests

magento-automated-testing · 2023-10-09T16:11:19Z

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

Varnish 6.0 is half a decade old. 4.x and 5.x have been EOL'd years ago and there shouldn't be any more distribution carrying those, there's no good reason to keep them around

gquintard · 2023-10-10T05:00:54Z

missed at least one occurrence
@magento run all tests

magento-automated-testing · 2023-10-10T05:01:02Z

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

ihor-sviziev

Hi @gquintard,
Could you please fix SVC failure by reverting constant removal and instead marking them as deprecated with an explanation that Varnish 4 and 5 has reached EOL?
Also, could you pls fix failing static tests?

gquintard · 2023-10-10T12:11:33Z

Sure, do you have an example on how to mark constants deprecated?

hostep · 2023-10-10T18:53:34Z

@gquintard: here are some examples:

magento2/app/code/Magento/Usps/Model/Carrier.php

Lines 36 to 49 in bc1c7ba

    
           /** @deprecated Redundant dependency */ 
        
           public const CONTAINER_VARIABLE = 'VARIABLE'; 
        
           /** @deprecated Redundant dependency */ 
        
           public const CONTAINER_FLAT_RATE_BOX = 'FLAT RATE BOX'; 
        
           /** @deprecated Redundant dependency */ 
        
           public const CONTAINER_FLAT_RATE_ENVELOPE = 'FLAT RATE ENVELOPE'; 
        
           /** @deprecated Redundant dependency */ 
        
           public const CONTAINER_RECTANGULAR = 'RECTANGULAR'; 
        
           /** @deprecated Redundant dependency */ 
        
           public const CONTAINER_NONRECTANGULAR = 'NONRECTANGULAR';

hostep · 2023-10-16T05:53:37Z

@magento run all tests

magento-automated-testing · 2023-10-16T05:53:48Z

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

gquintard · 2023-10-16T16:03:23Z

@ihor-sviziev, I saw that tests complained about missing @see comments so I just added them, however, that made me notice that VARNISH_SUPPORTED_VERSION_X and VARNISH_X_CONFIGURATION_PATH constants exist in both app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php and app/code/Magento/PageCache/Model/Config.php, which feels a bit redundant

engcom-Echo · 2023-12-20T06:12:20Z

@magento run all tests

magento-automated-testing · 2023-12-20T06:12:30Z

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

engcom-Echo · 2023-12-20T06:12:53Z

@magento create issue

engcom-Echo · 2023-12-20T09:40:08Z

@magento run WebAPI Tests,Integration Tests,Functional Tests CE,Functional Tests EE,Functional Tests B2B

magento-automated-testing · 2023-12-20T09:40:18Z

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

engcom-Echo · 2023-12-20T12:20:26Z

@magento run WebAPI Tests,Functional Tests B2B

magento-automated-testing · 2023-12-20T12:20:37Z

The requested builds are added to the queue. You should be able to see them here within a few minutes. Please message the #magento-devops slack channel if they don't show in a reasonable amount of time and a representative will look into any issues.

engcom-Echo · 2023-12-20T14:14:13Z

Functional Tests B2B failure are different on last two run on same commit.
Run1

Run2

Moving it to To Approve as for SVC need to raise internal approval ticket

engcom-Echo · 2023-12-21T05:38:06Z

We have raise internal approval JIRA. Once we get approval we will move this PR forward.
Till the time Moving it to Pending Approval

engcom-Echo · 2024-01-29T03:40:07Z

Functional Tests B2B failure are flaky based on comment.
We have got approval for JIRA.
Hence moving it to Merge In Progress.

m2-community-project bot added the Progress: pending review label Oct 9, 2023

scrub varnish 4/5 references

7201648

Varnish 6.0 is half a decade old. 4.x and 5.x have been EOL'd years ago and there shouldn't be any more distribution carrying those, there's no good reason to keep them around

gquintard force-pushed the only_varnish_6 branch from 23be608 to 7201648 Compare October 10, 2023 05:00

ihor-sviziev requested changes Oct 10, 2023

View reviewed changes

m2-community-project bot assigned ihor-sviziev Oct 10, 2023

m2-community-project bot added Progress: needs update and removed Progress: pending review labels Oct 10, 2023

ihor-sviziev added Progress: pending review Priority: P2 A defect with this priority could have functionality issues which are not to expectations. and removed Progress: needs update labels Oct 10, 2023

m2-community-project bot added Progress: pending review Progress: needs update and removed Progress: pending review labels Oct 10, 2023

ihor-sviziev changed the title ~~scrub varnish 4/5 references~~ Remove Varnish 4/5 support Oct 10, 2023

m2-community-project bot removed the Progress: pending review label Oct 10, 2023

ihor-sviziev added the Risk: low label Oct 10, 2023

hostep mentioned this pull request Oct 12, 2023

Don't cache private content in Varnish, only 200 and 404 responses. A… #36524

Merged

5 tasks

[varnish] re-add constant, as deprecated

801be7b

[varnish] add @see comment to deprecated constants

3d38d8e

engcom-Delta added the Triage: Dev.Experience Issue related to Developer Experience and needs help with Triage to Confirm or Reject it label Dec 4, 2023

sinhaparul added the Project: Community Picked PRs upvoted by the community label Dec 18, 2023

engcom-Echo self-assigned this Dec 19, 2023

Merge branch '2.4-develop' into only_varnish_6

f991baf

m2-assistant bot mentioned this pull request Dec 20, 2023

[Issue] Remove Varnish 4/5 support #38304

Closed

5 tasks

m2-community-project bot added Progress: testing in progress and removed Progress: ready for testing labels Dec 20, 2023

m2-community-project bot added Progress: pending approval Progress: to approve and removed Progress: testing in progress Progress: pending approval Progress: to approve labels Dec 20, 2023

m2-community-project bot added Progress: pending approval and removed Progress: to approve labels Dec 21, 2023

m2-community-project bot added Progress: accept and removed Progress: pending approval labels Jan 29, 2024

magento-devops-reposync-svc merged commit 4ce4490 into magento:2.4-develop Feb 24, 2024

Remove Varnish 4/5 support #38052

Remove Varnish 4/5 support #38052

Uh oh!

Conversation

gquintard commented Oct 9, 2023 • edited by m2-assistant bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description (*)

Contribution checklist (*)

Resolved issues:

Uh oh!

m2-assistant bot commented Oct 9, 2023

Uh oh!

ihor-sviziev commented Oct 9, 2023

Uh oh!

magento-automated-testing bot commented Oct 9, 2023

Uh oh!

gquintard commented Oct 10, 2023

Uh oh!

magento-automated-testing bot commented Oct 10, 2023

Uh oh!

ihor-sviziev left a comment

Choose a reason for hiding this comment

Uh oh!

gquintard commented Oct 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hostep commented Oct 10, 2023

Uh oh!

hostep commented Oct 16, 2023

Uh oh!

magento-automated-testing bot commented Oct 16, 2023

Uh oh!

gquintard commented Oct 16, 2023

Uh oh!

engcom-Echo commented Dec 20, 2023

Uh oh!

magento-automated-testing bot commented Dec 20, 2023

Uh oh!

engcom-Echo commented Dec 20, 2023

Uh oh!

engcom-Echo commented Dec 20, 2023

Uh oh!

magento-automated-testing bot commented Dec 20, 2023

Uh oh!

engcom-Echo commented Dec 20, 2023

Uh oh!

magento-automated-testing bot commented Dec 20, 2023

Uh oh!

engcom-Echo commented Dec 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

engcom-Echo commented Dec 21, 2023

Uh oh!

engcom-Echo commented Jan 29, 2024

Uh oh!

Uh oh!

gquintard commented Oct 9, 2023 •

edited by m2-assistant bot

Loading

gquintard commented Oct 10, 2023 •

edited

Loading

engcom-Echo commented Dec 20, 2023 •

edited

Loading