oblivian@puppetmaster1001:~$ sudo puppet-merge
E: failed to lock, another puppet-merge running on this host?
locking process tree: systemd---sshd---sshd---sshd(oblivian)---bash---sudo(root)---puppet-merge---pstree
oblivian@puppetmaster1001:~$ sudo puppet-merge
E: failed to lock, another puppet-merge running on this host?
could not determine lock holder
oblivian@puppetmaster1001:~$ sudo puppet-merge
Fetching new commits from :https://gerrit.wikimedia.org/r/labs/private

No changes to merge.
Fetching new commits from :https://gerrit.wikimedia.org/r/operations/puppet

diff --git a/modules/profile/manifests/mediawiki/maintenance.pp b/modules/profile/manifests/mediawiki/maintenance.pp
index a2174c77bf..5e7b4e4f20 100644
--- a/modules/profile/manifests/mediawiki/maintenance.pp
+++ b/modules/profile/manifests/mediawiki/maintenance.pp
@@ -31,6 +31,7 @@ class profile::mediawiki::maintenance {
 
     # Mediawiki maintenance scripts (cron jobs)
     include ::profile::mediawiki::maintenance::wikidata
+    include ::profile::mediawiki::maintenance::growthexperiments
     class { 'mediawiki::maintenance::pagetriage': ensure => $ensure }
     class { 'mediawiki::maintenance::translationnotifications': ensure => $ensure }
     class { 'mediawiki::maintenance::updatetranslationstats': ensure => $ensure }
diff --git a/modules/profile/manifests/mediawiki/maintenance/growthexperiments.pp b/modules/profile/manifests/mediawiki/maintenance/growthexperiments.pp
new file mode 100644
index 0000000000..0a4014a89b
--- /dev/null
+++ b/modules/profile/manifests/mediawiki/maintenance/growthexperiments.pp
@@ -0,0 +1,10 @@
+class profile::mediawiki::maintenance::growthexperiments {
+    # Purge old welcome survey data (personal data used in user options,
+    # with a 360-day retention exception) that's within 30 days of expiry,
+    # twice a month. See T208369. Logs are saved to
+    # /var/log/mediawiki/mediawiki_job_growthexperiments-deleteOldSurveys/syslog.log
+    profile::mediawiki::periodic_job { 'growthexperiments-deleteOldSurveys':
+        command  => '/usr/local/bin/foreachwikiindblist /srv/mediawiki/dblists/growthexperiments.dblist extensions/GrowthExperiments/maintenance/deleteOldSurveys.php --cutoff 335',
+        interval => '*-*-1,15 3:15:00',
+    }
+}

Giuseppe Lavagetto: mediawiki: maintenance script for purging old GrowthExperiments data (5809ad21a6)
Merge these changes? (yes/no)? yes
HEAD is currently e79f91c84c31962d9f06504202269977c6fe21da

Updating e79f91c84c..5809ad21a6
Fast-forward
 modules/profile/manifests/mediawiki/maintenance.pp                   |  1 +
 modules/profile/manifests/mediawiki/maintenance/growthexperiments.pp | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 modules/profile/manifests/mediawiki/maintenance/growthexperiments.pp
Running git clean to clean any untracked files.
HEAD is now 5809ad21a62094c953766c1c01969ee68996417d

Fetching new commits from :https://gerrit.wikimedia.org/r/operations/puppet

No changes to merge.
Connection to puppetmaster1002.eqiad.wmnet closed.
ERROR: puppet-merge on puppetmaster1002.eqiad.wmnet failed
Fetching new commits from :https://gerrit.wikimedia.org/r/operations/puppet

No changes to merge.
Connection to puppetmaster1003.eqiad.wmnet closed.
ERROR: puppet-merge on puppetmaster1003.eqiad.wmnet failed
Fetching new commits from :https://gerrit.wikimedia.org/r/operations/puppet

No changes to merge.
Connection to puppetmaster2001.codfw.wmnet closed.
ERROR: puppet-merge on puppetmaster2001.codfw.wmnet failed
Fetching new commits from :https://gerrit.wikimedia.org/r/operations/puppet

No changes to merge.
Connection to puppetmaster2002.codfw.wmnet closed.
ERROR: puppet-merge on puppetmaster2002.codfw.wmnet failed
Now running conftool-merge to sync any changes to conftool data
Running conftool-sync on /etc/conftool/data