Skip to content
This repository has been archived by the owner on Sep 5, 2023. It is now read-only.

Remove ES 6.7 50/50 AA test #466

Merged
merged 1 commit into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ab_tests/ab_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@
- A
- B
- BankHolidaysTest:
- A
- B
- EsSixPointSeven:
- A
- B
3 changes: 1 addition & 2 deletions configs/dictionaries/ab_test_expiries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
# ExampleTest: 86400
---
Example: 86400
BankHolidaysTest: 86400
EsSixPointSeven: 604800
BankHolidaysTest: 86400
3 changes: 1 addition & 2 deletions configs/dictionaries/active_ab_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
# bucket allocations. See example_percentages.yaml for format.
---
Example: true
BankHolidaysTest: true
EsSixPointSeven: true
BankHolidaysTest: true
3 changes: 0 additions & 3 deletions configs/dictionaries/essixpointseven_percentages.yaml

This file was deleted.

39 changes: 0 additions & 39 deletions spec/test-outputs/www-eks-integration.out.vcl

Choose a reason for hiding this comment

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

Good god that horrible 😄

Original file line number Diff line number Diff line change
Expand Up @@ -230,39 +230,6 @@ sub vcl_recv {
}
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
} else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
# Set the value of the header to whatever decision was previously made
set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
} else {
declare local var.denominator_EsSixPointSeven INTEGER;
declare local var.denominator_EsSixPointSeven_A INTEGER;
declare local var.nominator_EsSixPointSeven_A INTEGER;
set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
declare local var.denominator_EsSixPointSeven_B INTEGER;
declare local var.nominator_EsSixPointSeven_B INTEGER;
set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else {
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
}
}
}
}
# End dynamic section

Expand Down Expand Up @@ -424,12 +391,6 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
}
}
}
# End dynamic section

Expand Down
39 changes: 0 additions & 39 deletions spec/test-outputs/www-eks-production.out.vcl
Original file line number Diff line number Diff line change
Expand Up @@ -402,39 +402,6 @@ sub vcl_recv {
}
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
} else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
# Set the value of the header to whatever decision was previously made
set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
} else {
declare local var.denominator_EsSixPointSeven INTEGER;
declare local var.denominator_EsSixPointSeven_A INTEGER;
declare local var.nominator_EsSixPointSeven_A INTEGER;
set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
declare local var.denominator_EsSixPointSeven_B INTEGER;
declare local var.nominator_EsSixPointSeven_B INTEGER;
set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else {
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
}
}
}
}
# End dynamic section

Expand Down Expand Up @@ -596,12 +563,6 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
}
}
}
# End dynamic section

Expand Down
39 changes: 0 additions & 39 deletions spec/test-outputs/www-eks-staging.out.vcl
Original file line number Diff line number Diff line change
Expand Up @@ -402,39 +402,6 @@ sub vcl_recv {
}
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
} else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
# Set the value of the header to whatever decision was previously made
set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
} else {
declare local var.denominator_EsSixPointSeven INTEGER;
declare local var.denominator_EsSixPointSeven_A INTEGER;
declare local var.nominator_EsSixPointSeven_A INTEGER;
set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
declare local var.denominator_EsSixPointSeven_B INTEGER;
declare local var.nominator_EsSixPointSeven_B INTEGER;
set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else {
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
}
}
}
}
# End dynamic section

Expand Down Expand Up @@ -596,12 +563,6 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
}
}
}
# End dynamic section

Expand Down
39 changes: 0 additions & 39 deletions spec/test-outputs/www-eks-test.out.vcl
Original file line number Diff line number Diff line change
Expand Up @@ -230,39 +230,6 @@ sub vcl_recv {
}
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
} else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
# Set the value of the header to whatever decision was previously made
set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
} else {
declare local var.denominator_EsSixPointSeven INTEGER;
declare local var.denominator_EsSixPointSeven_A INTEGER;
declare local var.nominator_EsSixPointSeven_A INTEGER;
set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
declare local var.denominator_EsSixPointSeven_B INTEGER;
declare local var.nominator_EsSixPointSeven_B INTEGER;
set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else {
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
}
}
}
}
# End dynamic section

Expand Down Expand Up @@ -424,12 +391,6 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
}
}
}
# End dynamic section

Expand Down
39 changes: 0 additions & 39 deletions spec/test-outputs/www-integration.out.vcl
Original file line number Diff line number Diff line change
Expand Up @@ -230,39 +230,6 @@ sub vcl_recv {
}
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
} else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
# Set the value of the header to whatever decision was previously made
set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
} else {
declare local var.denominator_EsSixPointSeven INTEGER;
declare local var.denominator_EsSixPointSeven_A INTEGER;
declare local var.nominator_EsSixPointSeven_A INTEGER;
set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
declare local var.denominator_EsSixPointSeven_B INTEGER;
declare local var.nominator_EsSixPointSeven_B INTEGER;
set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else {
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
}
}
}
}
# End dynamic section

Expand Down Expand Up @@ -424,12 +391,6 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
}
}
}
# End dynamic section

Expand Down
39 changes: 0 additions & 39 deletions spec/test-outputs/www-production.out.vcl
Original file line number Diff line number Diff line change
Expand Up @@ -394,39 +394,6 @@ sub vcl_recv {
}
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
# Some users, such as remote testers, will be given a URL with a query string
# to place them into a specific bucket.
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
} else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
# Set the value of the header to whatever decision was previously made
set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
} else {
declare local var.denominator_EsSixPointSeven INTEGER;
declare local var.denominator_EsSixPointSeven_A INTEGER;
declare local var.nominator_EsSixPointSeven_A INTEGER;
set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
declare local var.denominator_EsSixPointSeven_B INTEGER;
declare local var.nominator_EsSixPointSeven_B INTEGER;
set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
} else {
set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
}
}
}
}
# End dynamic section

Expand Down Expand Up @@ -588,12 +555,6 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
}
}
if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
}
}
}
# End dynamic section

Expand Down
Loading
Loading