[02:36:41] !log Cherry-picked https://gerrit.wikimedia.org/r/#/c/operations/puppet/+/603550/ and https://gerrit.wikimedia.org/r/#/c/labs/private/+/604498/ into deployment-prep puppet to beta-test new XHGui (T180761). [02:36:44] Logged the message at https://wikitech.wikimedia.org/wiki/Release_Engineering/SAL [02:36:44] T180761: Move XHGui from tungsten to xhgui-001 - https://phabricator.wikimedia.org/T180761 [02:57:32] 10Project-Admins: Convert {My Project} to milestone of {Parent Project} - https://phabricator.wikimedia.org/T255090 (10Webtechnog) [02:59:04] 10Project-Admins: Convert {My Project} to milestone of {Parent Project} - https://phabricator.wikimedia.org/T255091 (10Webtechnog) [03:00:12] 10Project-Admins: Convert {My Project} to milestone of {Parent Project} - https://phabricator.wikimedia.org/T255091 (10Webtechnog) 05Open→03Resolved [03:05:26] 10Project-Admins: Convert {My Project} to milestone of {Parent Project} - https://phabricator.wikimedia.org/T255090 (10Webtechnog) p:05Triage→03Unbreak! [04:23:07] 10VPS-project-codesearch: Add TimedMediaHandler to WMF-deployed search preset - https://phabricator.wikimedia.org/T215584 (10DannyS712) >>! In T215584#4937396, @Legoktm wrote: > Fixed now, still wondering what would have caused this in the first place though. I wonder if it's the systemd timeouts that force auto... [04:24:37] 10VPS-project-codesearch, 10User-DannyS712: Flow isn't included in `deployed` search results - https://phabricator.wikimedia.org/T255094 (10DannyS712) [04:48:25] 10Project-Admins: Convert {My Project} to milestone of {Parent Project} - https://phabricator.wikimedia.org/T255090 (10greg) 05Open→03Invalid p:05Unbreak!→03Triage Hello. This seems to be a mistakenly submitted task. I'm closing as invalid. [05:33:58] 10Phabricator, 10User-DannyS712: Request: Update H322 - https://phabricator.wikimedia.org/T255097 (10DannyS712) [05:54:33] 10Phabricator, 10User-DannyS712: Request: Update H322 - https://phabricator.wikimedia.org/T255097 (10Aklapper) 05Open→03Resolved a:03Aklapper Done. Happy hacking! (Looking forward to this extension.) [06:29:17] (03PS1) 10Hashar: Vagrantfile change should trigger rake job [integration/config] - 10https://gerrit.wikimedia.org/r/604556 [06:29:57] 10Release-Engineering-Team (CI & Testing services), 10Ruby: mwgate-rake-docker build is broken for Wikibase on Jenkins - https://phabricator.wikimedia.org/T255021 (10hashar) It took 2 minutes 30 to transfer 77 MBytes from the central cache: ` 00:00:01.164 Defined: CASTOR_NAMESPACE="castor-mw-ext-and-skins/mast... [06:36:26] (03CR) 10Jforrester: "More ruby? Oy. ;-)" [integration/config] - 10https://gerrit.wikimedia.org/r/604556 (owner: 10Hashar) [06:41:35] 10phan-taint-check-plugin, 10Social-Tools, 10Patch-For-Review, 10ci-test-error: Fixup taint-check-plugin errors in SportsTeams - https://phabricator.wikimedia.org/T224800 (10Jdforrester-WMF) 05Open→03Declined I guess technically we just didn't do this. :-) [06:50:43] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10DannyS712) [07:10:52] 10Release-Engineering-Team (CI & Testing services), 10Ruby: mwgate-rake-docker build is broken for Wikibase on Jenkins - https://phabricator.wikimedia.org/T255021 (10hashar) 05Open→03Resolved a:03hashar [07:18:00] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10Nikerabbit) [08:02:00] 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team (CI & Testing services), 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Zuul: Add a second Gerrit connection in Zuul config - https://phabricator.wikimedia.org/T253263 (10hashar) 05Open→03Resolved I have restarted Zuul th... [08:02:07] 10Gerrit, 10Release-Engineering-Team (Development services), 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Developer Productivity, and 2 others: Upgrade to Gerrit 2.16.13 - https://phabricator.wikimedia.org/T200739 (10hashar) [08:15:53] (03CR) 10Hashar: "+ Pablo who wrote the feature at https://gerrit.wikimedia.org/r/#/c/integration/quibble/+/452384/" [integration/quibble] - 10https://gerrit.wikimedia.org/r/604380 (https://phabricator.wikimedia.org/T239396) (owner: 10Hashar) [08:16:20] 10Release-Engineering-Team (CI & Testing services), 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Quibble, 10Regression: Regression: lost the ability to --dump-db-postrun - https://phabricator.wikimedia.org/T239396 (10hashar) [08:37:39] 10phan, 10MediaWiki-Vagrant, 10Operations: It should be possible to install php-ast using apt-get on MediaWiki-Vagrant - https://phabricator.wikimedia.org/T234240 (10Lokal_Profil) @Mainframe98 Would you mind describing how you did get ast-php installed in your Vagrant? (Since I'm struggling with the same). [08:41:28] 10phan, 10MediaWiki-Vagrant, 10Operations: It should be possible to install php-ast using apt-get on MediaWiki-Vagrant - https://phabricator.wikimedia.org/T234240 (10Mainframe98) >>! In T234240#6213969, @Lokal_Profil wrote: > @Mainframe98 Would you mind describing how you did get ast-php installed in your Va... [09:20:16] (03PS1) 10Hashar: test: non production kind use composer [integration/config] - 10https://gerrit.wikimedia.org/r/604631 [09:21:20] (03CR) 10jerkins-bot: [V: 04-1] test: non production kind use composer [integration/config] - 10https://gerrit.wikimedia.org/r/604631 (owner: 10Hashar) [09:24:51] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10Addshore) [09:27:18] (03Abandoned) 10Hashar: test: non production kind use composer [integration/config] - 10https://gerrit.wikimedia.org/r/604631 (owner: 10Hashar) [09:55:26] thcipriani, hashar: I think gerrit-replica is OOMing again [10:01:29] 10VPS-project-codesearch, 10User-DannyS712: Flow isn't included in `deployed` search results - https://phabricator.wikimedia.org/T255094 (10Legoktm) gerrit-replica is 502ing again, probably because of OOM. ` Jun 10 20:06:09 codesearch6 docker[28181]: 2020/06/10 20:06:09 Failed to git fetch /data/data/vcs-12e9... [10:02:24] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10Legoktm) p:05Triage→03High [10:02:27] ^ task [10:22:19] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10Dzahn) 10:21 < mutante> !log restarting gerrit on gerrit-replica (gerrit2001) - java.lang.OutOfMemoryError: Java heap space [10:30:19] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10hashar) On gerrit2001. seems like it ended up being out of java heap space at 10:13 UTC: ` [2020-06-11 10:13:26,029] [HTTP-95987] ERROR com.google.gerrit.pgm.http.jetty.HiddenErro... [10:32:05] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10Dzahn) >>! In T255094#6214530, @hashar wrote: > And restarted automagically? No, see comment above. [10:33:21] (03CR) 10Jforrester: "Hmm. It's OK to use vendor if you don't have any local composer things – in fact, we should strongly encourage people not to have local co" [integration/config] - 10https://gerrit.wikimedia.org/r/604631 (owner: 10Hashar) [10:34:56] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10hashar) 05Open→03Resolved a:03hashar And looks like a good amount of requests originate from `codesearch6.codesearch.eqiad1.wikimedia.cloud` which apparently tries to crawl... [10:37:54] !log Run `update page set page_content_model="json" where page_content_model = "CollaborationListContent" OR page_content_model = "CollaborationHubContent";` at beta enwiki (T255107) [10:37:56] Logged the message at https://wikitech.wikimedia.org/wiki/Release_Engineering/SAL [10:37:57] T255107: The content model 'CollaborationListContent' is not registered on this wiki.See https://www.mediawiki.org/wiki/Content_handlers to find out which extensions handle this content model. - https://phabricator.wikimedia.org/T255107 [10:44:02] 10VPS-project-codesearch: Wikibase not included in codesearch’s “everything” group - https://phabricator.wikimedia.org/T255125 (10Lucas_Werkmeister_WMDE) [10:50:43] (03CR) 10Hashar: [C: 03+2] build: Updating php-parallel-lint/php-parallel-lint to 1.2.0 [integration/docroot] - 10https://gerrit.wikimedia.org/r/604621 (owner: 10Libraryupgrader) [10:56:01] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10Legoktm) For reference: {F31861353} >>! In T255094#6214540, @hashar wrote: > And looks like a good amount of requests originate from `codesearch6.codesearch.eqiad1.wikimedia.clo... [11:06:40] 10VPS-project-codesearch: Wikibase not included in codesearch’s “everything” group - https://phabricator.wikimedia.org/T255125 (10Legoktm) 05Open→03Resolved a:03Legoktm Fallout from {T255094}, I restarted everything, it should be fixed in a few minutes. [11:09:18] (03CR) 10Thiemo Kreuz (WMDE): [C: 03+2] "I don't fully understand why this works. This sniffs implementation is a mess. What is "real"? To what does $defaultNull refer to? To the " [tools/codesniffer] - 10https://gerrit.wikimedia.org/r/598053 (owner: 10Arlolra) [11:10:16] (03Merged) 10jenkins-bot: Fix for nullable doc with nullable type and default null [tools/codesniffer] - 10https://gerrit.wikimedia.org/r/598053 (owner: 10Arlolra) [11:12:37] (03CR) 10Daimona Eaytoy: [C: 03+1] "> I don't fully understand why this works. This sniffs implementation" [tools/codesniffer] - 10https://gerrit.wikimedia.org/r/598053 (owner: 10Arlolra) [11:19:10] 10Beta-Cluster-Infrastructure, 10Release-Engineering-Team, 10observability: Logstash-Beta cannot be accessed: 504 Gateway Time-out - https://phabricator.wikimedia.org/T254801 (10MarcoAurelio) >>! In T254801#6211990, @Krenair wrote: > Can I suggest that efforts may be better placed on getting logstash03 into... [11:31:57] (03CR) 10Thiemo Kreuz (WMDE): [C: 03+2] Fix for nullable type with default null (032 comments) [tools/codesniffer] - 10https://gerrit.wikimedia.org/r/598054 (owner: 10Arlolra) [11:32:45] (03Merged) 10jenkins-bot: Fix for nullable type with default null [tools/codesniffer] - 10https://gerrit.wikimedia.org/r/598054 (owner: 10Arlolra) [11:36:12] (03CR) 10Thiemo Kreuz (WMDE): [C: 03+2] UnusedGlobalVariablesSniff should work with closures [tools/codesniffer] - 10https://gerrit.wikimedia.org/r/593641 (owner: 10Umherirrender) [11:36:59] (03Merged) 10jenkins-bot: UnusedGlobalVariablesSniff should work with closures [tools/codesniffer] - 10https://gerrit.wikimedia.org/r/593641 (owner: 10Umherirrender) [12:08:27] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10Majavah) [12:31:05] 10Phabricator: Rename user in Phabricator - https://phabricator.wikimedia.org/T255106 (10Aklapper) 05Open→03Resolved Thanks! Done. [12:36:34] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10hashar) We could also have codesearch crawls from local copy of the repositories by replicating Gerrit repositories to the codesearch host. But I guess we would then want to promo... [12:47:37] 10Release-Engineering-Team-TODO, 10Quibble, 10phpunit-patch-coverage, 10Test-Coverage: mwcore-phpunit-coverage-patch runs against old MW code - https://phabricator.wikimedia.org/T237923 (10hashar) 05Open→03Declined Indeed, that is an edge case due to the PHPUnit version being different. [13:16:23] (03PS1) 10Hashar: Define python deps in setup.cfg [integration/quibble] - 10https://gerrit.wikimedia.org/r/604702 (https://phabricator.wikimedia.org/T235118) [13:24:07] 10Release-Engineering-Team (CI & Testing services), 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Quibble, 10Patch-For-Review: Create an integration test running Quibble with mediawiki/core - https://phabricator.wikimedia.org/T235118 (10hashar) >>! In T235118#5708092, @awight wrote: >>>! In... [13:26:08] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team, 10Pywikibot: Jenkins can't merge patchsets sometimes - https://phabricator.wikimedia.org/T252310 (10Dvorapa) 05Resolved→03Open Occured again. Possibly have something to do with git tags, because today... [13:31:05] 10VPS-project-codesearch: Wikibase not included in codesearch’s “everything” group - https://phabricator.wikimedia.org/T255125 (10Lucas_Werkmeister_WMDE) Great, thanks! [13:35:04] (03PS1) 10Reedy: Add CommonPasswords to CI [integration/config] - 10https://gerrit.wikimedia.org/r/604706 (https://phabricator.wikimedia.org/T254799) [13:35:06] (03PS1) 10Reedy: Remove PasswordBlacklist from CI [integration/config] - 10https://gerrit.wikimedia.org/r/604707 (https://phabricator.wikimedia.org/T254799) [13:35:14] (03CR) 10Reedy: [C: 03+2] Add CommonPasswords to CI [integration/config] - 10https://gerrit.wikimedia.org/r/604706 (https://phabricator.wikimedia.org/T254799) (owner: 10Reedy) [13:36:33] (03Merged) 10jenkins-bot: Add CommonPasswords to CI [integration/config] - 10https://gerrit.wikimedia.org/r/604706 (https://phabricator.wikimedia.org/T254799) (owner: 10Reedy) [13:37:05] !log Reloading Zuul to deploy https://gerrit.wikimedia.org/r/604706 T254799 [13:37:07] Logged the message at https://wikitech.wikimedia.org/wiki/Release_Engineering/SAL [13:37:07] T254799: Rename wikimedia/password-blacklist library - https://phabricator.wikimedia.org/T254799 [13:45:01] PROBLEM - Free space - all mounts on deployment-snapshot01 is CRITICAL: CRITICAL: deployment-prep.deployment-snapshot01.diskspace._data.byte_percentfree (No valid datapoints found)deployment-prep.deployment-snapshot01.diskspace.root.byte_percentfree (<10.00%) [13:52:34] 10Continuous-Integration-Config, 10Release-Engineering-Team: Add a CI Job for running bundlesize tests in Vector - https://phabricator.wikimedia.org/T255149 (10Jdrewniak) [13:55:00] RECOVERY - Free space - all mounts on deployment-snapshot01 is OK: OK: deployment-prep.deployment-snapshot01.diskspace._data.byte_percentfree (No valid datapoints found) [13:57:36] 10Continuous-Integration-Infrastructure (phase-out-jessie), 10Release-Engineering-Team (CI & Testing services), 10Release-Engineering-Team-TODO, 10Operations, 10Patch-For-Review: Migrate contint* hosts to Buster - https://phabricator.wikimedia.org/T224591 (10Dzahn) Technically this is done because both c... [14:01:08] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team, 10Pywikibot: Jenkins can't merge patchsets sometimes - https://phabricator.wikimedia.org/T252310 (10Xqt) If I remove those two tags `stable` and `python2` which where changed previously (i.e. removed upstr... [14:03:56] 10Continuous-Integration-Config, 10Release-Engineering-Team: Add a CI Job for running bundlesize tests in Vector - https://phabricator.wikimedia.org/T255149 (10Jdrewniak) [14:13:34] (03PS1) 10DannyS712: Add GlobalWatchlist extension to CI [integration/config] - 10https://gerrit.wikimedia.org/r/604719 (https://phabricator.wikimedia.org/T255096) [14:15:52] (03PS2) 10DannyS712: Add GlobalWatchlist extension to CI [integration/config] - 10https://gerrit.wikimedia.org/r/604719 (https://phabricator.wikimedia.org/T255096) [14:20:03] (03CR) 10Jforrester: "Shall we do this now? Or wait for a publish of the new library first? :-)" [integration/config] - 10https://gerrit.wikimedia.org/r/604707 (https://phabricator.wikimedia.org/T254799) (owner: 10Reedy) [14:32:41] (03Abandoned) 10Paladox: Add mysql-connector-java [software/gerrit] (deploy/wmf/stable-2.15) - 10https://gerrit.wikimedia.org/r/548549 (owner: 10Paladox) [14:34:56] (03CR) 10Reedy: "It can probably just go, I doubt we're going to be doing any more actual patches to this repo" [integration/config] - 10https://gerrit.wikimedia.org/r/604707 (https://phabricator.wikimedia.org/T254799) (owner: 10Reedy) [14:37:04] (03CR) 10Reedy: [C: 03+2] Remove PasswordBlacklist from CI [integration/config] - 10https://gerrit.wikimedia.org/r/604707 (https://phabricator.wikimedia.org/T254799) (owner: 10Reedy) [14:38:25] (03Merged) 10jenkins-bot: Remove PasswordBlacklist from CI [integration/config] - 10https://gerrit.wikimedia.org/r/604707 (https://phabricator.wikimedia.org/T254799) (owner: 10Reedy) [14:40:27] !log Reloading Zuul to deploy https://gerrit.wikimedia.org/r/604707 [14:40:28] Logged the message at https://wikitech.wikimedia.org/wiki/Release_Engineering/SAL [14:44:33] !log rm -rf doc1001:/srv/docroot/org/wikimedia/doc/mediawiki-libs-PasswordBlacklist T254799 [14:44:35] Logged the message at https://wikitech.wikimedia.org/wiki/Release_Engineering/SAL [14:44:35] T254799: Rename wikimedia/password-blacklist library - https://phabricator.wikimedia.org/T254799 [14:54:46] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team, 10Pywikibot: Jenkins can't merge patchsets sometimes - https://phabricator.wikimedia.org/T252310 (10Dvorapa) After 3.0.2020070x we will no longer need to update `python2`. `stable` was suggested by severa... [15:24:44] (03PS1) 10Addshore: phpmetrics for Wikibase [integration/config] - 10https://gerrit.wikimedia.org/r/604760 [15:25:04] Reedy: ^^ mind giving that a once over if your around? :D [15:25:17] its mostly copy past from the mediawiki core one right now [15:25:27] oh, hashar is also here! :D [15:25:35] C-1 copy paste [15:25:56] I'll try and put it in a ttemplate or something for extensions once I see it actually works :P [15:28:57] * addshore reads the jjb howto again [15:29:30] addshore: it is copy pasted isn't ? ;) [15:29:36] yes :P [15:30:14] 7 lines changed I think [15:30:15] not sure how we can abstract the existing one to have it used by others [15:30:28] which is mainly the name of the repo / name of the project, but also the publishers [15:30:44] might help to have both in the same file, by moving the mediawiki definition to that new phpmetrics.yaml file [15:30:48] I saw this project wdio-selenium-daily thing at the bottom of mediawiki-extensions which I guess would be the direction to go in? [15:31:01] might be ;] [15:31:03] hashar: YEs I was thinking that, and can do if you would like! [15:31:17] yeah so that at lesat all the magic madness is at the same place ;] [15:31:20] I didnt figure out how that project thing works yet though :P but would love to see if the output works today ;) [15:31:24] * addshore will do that [15:32:29] When merging in (reviewing in) changes from a Github upstream project to Gerrit I'm hitting "the number of pushed changes in a batch exceeds the max limit 10". [15:32:41] This is mentioned and declined in https://phabricator.wikimedia.org/T200785 [15:32:54] Are there any recommendations on how to handle this? [15:33:07] (03PS2) 10Addshore: phpmetrics for Wikibase [integration/config] - 10https://gerrit.wikimedia.org/r/604760 [15:33:58] If I fetch --depth at the time, I'm hitting unlreated history problems instead. [15:34:02] kalle: afaik that is all managed by the various permissions of groups on the repos [15:35:11] hashar: can i build the jenkins job config things on jenkins itself yet? :D [15:36:26] (03PS1) 10Karl Wettin (WMSE): Edit Project Config [services/wikispeech/wikispeech_mockup] (refs/meta/config) - 10https://gerrit.wikimedia.org/r/604763 [15:38:20] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team, 10Pywikibot: Jenkins can't merge patchsets sometimes - https://phabricator.wikimedia.org/T252310 (10Xqt) >>! In T252310#6215511, @Dvorapa wrote: > > `stable` was suggested by several people to be made int... [15:39:16] addshore: I don't think you have the permission [15:39:37] kalle: yeah Gerrit has a hardset limit to prevent creating more than ten changes at a time [15:40:07] kalle: if importing from an external git repository, you want to just push to the branch [15:43:39] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team, 10Pywikibot: Jenkins can't merge patchsets sometimes - https://phabricator.wikimedia.org/T252310 (10Dvorapa) In standard git environemnt this would mean just to merge master branch into stable branch after... [15:43:54] hashar: Our repo is an augmentation (blubber and ci-pipeline) of the upstream project with minor changes to logs and what not. We'd really like to use review for these parts. But you suggest we switch to pushing? Not sure I got what you wrote there. [15:44:35] kalle: I need more context really [15:44:43] is that an upstream projects that you are trying to blubber / ci-pipeline ? [15:45:04] kalle he means pushing straight into the repo without putting it up for review. [15:45:08] I am not sure it makes much sense in this context. There is probably a better way to craft a container from an upstream project [15:45:20] or else [15:45:31] git push origin HEAD:refs/heads/ rather than git push origin HEAD:refs/for/ [15:45:36] instead you could have our repo in Gerrit to have the upstream project as a git submodule [15:45:37] hashar: Sure. There is an upstream project on Github. We use this in our project. So we have a downstream repo in Gerrit in which we have a few minor changes, plus that we added Blubber stuff. [15:45:46] this way you separete the custom wikimedia stuff from the upstream code [15:46:04] ah [15:46:10] * hashar feels lagging today [15:46:14] From time to time we want to merge in the upstream project to our downstream project. [15:46:19] ok ok [15:46:41] we do that for a bunch of projects. A common trend is in Gerrit to create an 'upstream' branch [15:46:58] then you would push the change from github to that upstream branch [15:47:13] and later you can marge the updated upstream branch into your master branch and send that for review. That will result in a single change [15:47:19] so something like: [15:47:30] git remote add origin [15:47:40] git remote add github [15:47:51] git push github/master:gerrit:upstream [15:48:09] (that will send the upstream objects to gerrit without causing any change to be created in the Gerrit interface) [15:48:20] cause it is a push to the 'upstream' branch [15:48:22] then [15:48:25] git checkout master [15:48:27] git merge upstream [15:48:30] (fix stuff) [15:48:48] and the result can be send to gerrit for review: git push origin HEAD:refs/for/master [15:48:52] (or git-review) [15:49:14] which would just send the merg ecommit and result in a single change being created [15:50:07] Alright, I'll try that out. Thanks for the help! [15:52:21] kalle: the idea is that wehn you send the upstream commits from github, Gerrit doesn't know about them and would try to craft a change for each of them [15:52:45] hashar: as I don't have any of the magic jjb stuff locally yet, and also can't use jenkins to build the thing itself, would you mind possibly deploying the job for me? :D [15:52:49] so surely if one import hundred of commits, there is no point in having a hundred of changes added to Gerrit nor do we want to CR+2/Submit each of them ;] [15:57:06] AttributeError: 'QuibbleCmd' object has no attribute 'args' [15:57:06] grblblblb [16:01:08] (03PS1) 10Hashar: Fix --dry-run due to lack of self.args [integration/quibble] - 10https://gerrit.wikimedia.org/r/604781 [16:02:28] (03CR) 10Hashar: [C: 03+2] "Which eventually caused --dry-run to fail, the rebase did not take in account that --dry-run got reintroduced and still refers to self.arg" [integration/quibble] - 10https://gerrit.wikimedia.org/r/590508 (owner: 10Awight) [16:03:05] addshore: sorry I am in some quibble hacking :/ Trying to get a job to run it in CI on each change to integration/quibble.git [16:03:12] to help catch issues such as the above one :/ [16:03:20] (03CR) 10Hashar: [C: 04-1] "Need a test" [integration/quibble] - 10https://gerrit.wikimedia.org/r/604781 (owner: 10Hashar) [16:03:33] okay! I'll have a look at getting my jjb thing working again! [16:12:15] hashar: wow, that went so much smoother than last time! https://integration.wikimedia.org/ci/job/wikibase-phpmetrics-docker/ [16:12:17] <3 [16:12:22] * addshore tries running it [16:13:17] oh [16:13:22] addshore: so you have the permissions ;) [16:13:30] addshore: we can polish it up tomorrow if you want. I will get time [16:13:36] <3 [16:13:43] if it works *fingers crossed* [16:14:25] hehe [16:16:57] https://doc.wikimedia.org/Wikibase/master/phpmetrics/ win [16:17:14] hashar: I think with your help tommorrow would couple templatify this and deploy it for "all" extensions we want [16:22:53] addshore: sure! I should be around at 9am tomorrow [16:29:27] yes [16:29:30] err [16:29:44] addshore: note that it was just a quick hack at start ;) [16:31:55] (03PS1) 10Hashar: Integration job for Quibble [integration/config] - 10https://gerrit.wikimedia.org/r/604785 (https://phabricator.wikimedia.org/T235118) [16:32:47] quick hacks are the best, when they work for years without problems :P [16:37:53] 10Continuous-Integration-Config, 10Readers-Web-Backlog (Kanbanana-2019-20-Q4), 10Vue.js (Vue.js-Search): Install Jest for unit tests for Vue.js search - https://phabricator.wikimedia.org/T249301 (10Niedzielski) [16:38:57] 10Continuous-Integration-Config, 10phan, 10phan-taint-check-plugin, 10Patch-For-Review: Upgrade to php-ast 1.0.6 in CI - https://phabricator.wikimedia.org/T255004 (10Jdforrester-WMF) a:03Jdforrester-WMF [16:39:14] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team (CI & Testing services), 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Patch-For-Review: Rename all our quibble jobs to make some sense - https://phabricator.wikimedia.org/T254814 (10Jdforre... [16:39:50] addshore: what’s the easiest way to get a dev version of wikidata these days? [16:39:55] docker? vagrant? something else? [16:53:36] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team, 10Pywikibot: Jenkins can't merge patchsets sometimes - https://phabricator.wikimedia.org/T252310 (10Dvorapa) With git it should work like this: ` $ git tag -a 3.0.20200707 $ python3 setup.py sdist ... pos... [16:56:27] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team, 10Pywikibot: Jenkins can't merge patchsets sometimes - https://phabricator.wikimedia.org/T252310 (10Dvorapa) It should be much more simple like: ` $ git tag -a 3.0.20200707 $ python3 setup.py sdist ... pos... [17:03:56] 10Continuous-Integration-Config, 10Continuous-Integration-Infrastructure, 10Release-Engineering-Team, 10Pywikibot: Jenkins can't merge patchsets sometimes - https://phabricator.wikimedia.org/T252310 (10Dvorapa) StackOverflow suggests this: ` $ git tag -a 3.0.20200707 $ python3 setup.py sdist ... possibly c... [17:06:02] 10Continuous-Integration-Infrastructure: Authenticate github API requests in CI - https://phabricator.wikimedia.org/T254319 (10hashar) @bd808 @Reedy do you know how the Github token for CI got generated ( T248387#6000432 ) ? This task is about having an unprivileged token and I assume that is the case of the to... [17:06:46] 10Continuous-Integration-Infrastructure, 10Operations, 10Traffic: Caching of https://doc.wikimedia.org/cover/mediawiki-libs-IPUtils/IPUtils.php.html is inconsistent - https://phabricator.wikimedia.org/T252131 (10Jdforrester-WMF) 05Open→03Declined Working as expected. [17:16:26] 10Continuous-Integration-Config, 10Equivset: Don't `RUN phpdismod xdebug` for Equivset - https://phabricator.wikimedia.org/T255164 (10Jdforrester-WMF) Meh. We disable it for speed because it's so slow. I guess we could make a special snowflake image for this library… [17:17:08] Is anyone available to add my new globalwatchlist extension to CI? https://gerrit.wikimedia.org/r/#/c/integration/config/+/604719/ [17:17:35] 10Continuous-Integration-Config, 10Equivset: Enable php-xdebug for Equivset jobs - https://phabricator.wikimedia.org/T255164 (10Jdforrester-WMF) @Krinkle says you can tell phpunit to do it via `composer.json`. [17:17:37] 10Continuous-Integration-Config, 10Equivset: Enable php-xdebug for Equivset jobs - https://phabricator.wikimedia.org/T255164 (10Krinkle) [17:19:21] 10Continuous-Integration-Config, 10Release-Engineering-Team: Add a CI Job for running bundlesize tests in Vector - https://phabricator.wikimedia.org/T255149 (10hashar) On the topic of tracking the size of assets: last week WMDE added some historical tracking of two of their components. The result can be seen a... [17:21:59] 10Continuous-Integration-Config, 10Release-Engineering-Team: Add a CI Job for running bundlesize tests in Vector - https://phabricator.wikimedia.org/T255149 (10hashar) Summary from a discussion with Timo. WMDE writes node module and track it after merge for long time perspective. Webteam writes a MediaWiki ext... [17:23:33] 10Continuous-Integration-Config, 10Release-Engineering-Team: Add a CI Job for running bundlesize tests in Vector - https://phabricator.wikimedia.org/T255149 (10Jdforrester-WMF) The easiest thing would be to write this as a PHP structure test, but if that can't work for some reason, we'd need to build you a cus... [17:26:01] 10Continuous-Integration-Config, 10Equivset: Enable php-xdebug for Equivset jobs - https://phabricator.wikimedia.org/T255164 (10Reedy) >>! In T255164#6216163, @Jdforrester-WMF wrote: > @Krinkle says you can tell phpunit to do it via `composer.json`. Presumably `COMPOSER_ALLOW_XDEBUG=1`? [17:27:57] 10Continuous-Integration-Infrastructure: Authenticate github API requests in CI - https://phabricator.wikimedia.org/T254319 (10bd808) >>! In T254319#6216101, @hashar wrote: > @bd808 @Reedy do you know how the Github token for CI got generated ( T248387#6000432 ) ? > > This task is about having an unprivileged t... [17:28:44] 10Continuous-Integration-Config, 10Release-Engineering-Team (CI & Testing services), 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Doxygen, and 2 others: mwext-doxygen-publish Doxygen 1.8.18 fails for Wikibase.git - https://phabricator.wikimedia.org/T254465 (10hashar) 05Open→03Stalled St... [17:29:16] 10Continuous-Integration-Config, 10Release-Engineering-Team: Add a CI Job for running bundlesize tests in Vector - https://phabricator.wikimedia.org/T255149 (10Krinkle) The npm-test job is expected to be standalone, both to maitain consistency for CI management (building and maintaining a custom Jenkins CI ima... [17:49:38] 10Continuous-Integration-Config, 10Equivset: Enable php-xdebug for Equivset jobs - https://phabricator.wikimedia.org/T255164 (10dbarratt) >>! In T255164#6216163, @Jdforrester-WMF wrote: > @Krinkle says you can tell phpunit to do it via `composer.json`. We're already doing that: https://gerrit.wikimedia.org/r/... [17:54:13] 10Continuous-Integration-Config, 10Equivset: Enable php-xdebug for Equivset jobs - https://phabricator.wikimedia.org/T255164 (10Reedy) >>! In T255164#6216282, @dbarratt wrote: >>>! In T255164#6216163, @Jdforrester-WMF wrote: >> @Krinkle says you can tell phpunit to do it via `composer.json`. > > We're already... [18:20:31] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10Nikerabbit) [18:29:05] Jdlrobson: how much of the Wikidata setup do you want? [18:29:59] At the end of the day it's just an extension and is as easy to run as any other extension :) I don't think any of our Devs use vagrant, one of the docker solutions is probably best [18:31:21] {{cn}} [18:32:07] The thing that seems to trip most people up is not reading how to load the extension. As it doesn't use wfload extension yet, and you also need to include a default settings file. [18:48:48] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10DannyS712) [18:57:58] 10LibUp: Keep the list of packages in libup web when clone fails - https://phabricator.wikimedia.org/T255183 (10Umherirrender) [19:00:42] anyone about to deploy things, please hold them [19:00:45] we have an outage [19:00:56] you may see -operations if you want to follow along [19:03:18] yup, already let the team know, thanks! [19:19:58] will do [19:20:10] er. misread, ignore :-D [19:23:11] :) [19:26:02] might be more than that 10 mins [19:34:36] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10Agusbou2015) [19:35:06] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10Agusbou2015) [20:12:20] 10Scap, 10Operations: scap's logstash_checker.py is blissfully unaware of any logstash indexing latency - https://phabricator.wikimedia.org/T255197 (10CDanis) [20:15:04] 10Scap, 10Operations, 10Wikimedia-Incident: scap's logstash_checker.py is blissfully unaware of any logstash indexing latency - https://phabricator.wikimedia.org/T255197 (10greg) [20:16:17] 10Scap, 10Operations, 10Sustainability (Incident Prevention): scap's logstash_checker.py is blissfully unaware of any logstash indexing latency - https://phabricator.wikimedia.org/T255197 (10greg) [21:05:56] 10Release-Engineering-Team-TODO, 10Scap, 10Operations, 10Sustainability (Incident Prevention), 10User-brennen: scap's logstash_checker.py is blissfully unaware of any logstash indexing latency - https://phabricator.wikimedia.org/T255197 (10brennen) [21:19:57] PROBLEM - App Server Main HTTP Response on deployment-mediawiki-07 is CRITICAL: CRITICAL - Socket timeout after 10 seconds [21:30:51] PROBLEM - English Wikipedia Main page on beta-cluster is CRITICAL: CRITICAL - Socket timeout after 10 seconds [21:55:55] 10Continuous-Integration-Infrastructure: Authenticate github API requests in CI - https://phabricator.wikimedia.org/T254319 (10bd808) >>! In T254319#6216101, @hashar wrote: > This task is about having an unprivileged token and I assume that is the case of the token that got created. Then we can expose it as bo... [22:13:10] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10Legoktm) >>! In T255094#6214940, @hashar wrote: > We could also have codesearch crawls from local copy of the repositories by replicating Gerrit repositories to the codesearch hos... [22:54:13] (03PS1) 10Ejegg: Remove ContributionTracking [integration/config] - 10https://gerrit.wikimedia.org/r/604892 [23:10:18] hi relengers! I'm trying to delete this obsolete extension that used to be a prerequisite for DonationInterface [23:10:24] oops [23:10:31] delete? [23:10:38] 10Release-Engineering-Team-TODO (2020-04 to 2020-06 (Q4)), 10Release, 10Train Deployments: 1.35.0-wmf.36 deployment blockers - https://phabricator.wikimedia.org/T254173 (10jeena) 05Open→03Resolved [23:10:40] We don't really delete, just "archive" [23:10:43] yep, it's no longer needed for any purpose [23:10:46] ok, archive then [23:10:58] so I'm trying to deinstall it from paymentswiki [23:11:02] basically, remove the CI stuff, mark as readonly in gerrit... [23:11:14] We do have a template for creating a task for it to be done [23:11:21] cool, I have this patch to remove it from ci > https://gerrit.wikimedia.org/r/604892 [23:11:55] should be perfectly safe to +2 [23:12:06] https://phabricator.wikimedia.org/maniphest/task/edit/form/33/ [23:12:21] thanks! I'll fill that out too [23:12:33] that'll clear up most of the loose ends [23:14:20] It's probably worthwhile waiting until it's fully undeployed [23:14:48] 10Gerrit, 10VPS-project-codesearch, 10User-DannyS712: gerrit-replica 502/OOM again - https://phabricator.wikimedia.org/T255094 (10Ladsgroup) >>! In T255094#6217402, @Legoktm wrote: >>>! In T255094#6214940, @hashar wrote: >> We could also have codesearch crawls from local copy of the repositories by replicati... [23:14:54] OK, cool. I need that CI patch +2ed in order to undeploy it on payments-wiki [23:15:10] hmm [23:15:15] chicken and egg problem :) [23:15:42] It's still enabled on donatewiki, foundationwiki and testwiki [23:15:43] Otherwise the mw commit where I deinit & remove the submodule fails tests [23:15:56] yep, I've got a config patch to remove it there too [23:15:58] one sec... [23:16:17] I think just removing the => true for those is good enough to start [23:16:17] https://gerrit.wikimedia.org/r/604778 [23:16:37] ah, that patch removes it entirely [23:16:47] that's alright too ;) [23:17:36] ejegg: And that's good to go whenever, right? [23:21:06] yep! [23:22:57] The 'dependency' from DonationInterface on ContributionTracking was that DonationInterface used a connection string managed by ContributionTracking to insert things directly in the payments DB. But those credentials haven't been deployed to main cluster for years and years [23:23:20] so we could have removed it from all those wikis a long time ago [23:23:28] heh [23:23:31] sods law :) [23:24:16] Amir1 is on with removing it from prod [23:25:31] Hi. I posted earlier, but people have joined - is anyone able to approve enabling CI for my new GlobalWatchlist extension? https://gerrit.wikimedia.org/r/#/c/integration/config/+/604719/ [23:25:45] (03PS3) 10Reedy: Add GlobalWatchlist extension to CI [integration/config] - 10https://gerrit.wikimedia.org/r/604719 (https://phabricator.wikimedia.org/T255096) (owner: 10DannyS712) [23:25:49] (03CR) 10Reedy: [C: 03+2] Add GlobalWatchlist extension to CI [integration/config] - 10https://gerrit.wikimedia.org/r/604719 (https://phabricator.wikimedia.org/T255096) (owner: 10DannyS712) [23:26:03] thanks Reedy [23:26:50] thanks Reedy! and thanks Amir1 [23:26:58] (03Merged) 10jenkins-bot: Add GlobalWatchlist extension to CI [integration/config] - 10https://gerrit.wikimedia.org/r/604719 (https://phabricator.wikimedia.org/T255096) (owner: 10DannyS712) [23:27:26] !log Reloading Zuul to deploy https://gerrit.wikimedia.org/r/604719 T255096 [23:27:28] Logged the message at https://wikitech.wikimedia.org/wiki/Release_Engineering/SAL [23:27:28] T255096: Extension setup for GlobalWatchlist - https://phabricator.wikimedia.org/T255096 [23:28:11] (03PS2) 10Reedy: Remove ContributionTracking [integration/config] - 10https://gerrit.wikimedia.org/r/604892 (owner: 10Ejegg) [23:34:21] (03CR) 10Reedy: [C: 03+2] Remove ContributionTracking [integration/config] - 10https://gerrit.wikimedia.org/r/604892 (owner: 10Ejegg) [23:35:36] (03Merged) 10jenkins-bot: Remove ContributionTracking [integration/config] - 10https://gerrit.wikimedia.org/r/604892 (owner: 10Ejegg) [23:35:52] rockin! [23:39:59] !log deployed quibble-donationinterface-REL1_31-php70-docker with https://gerrit.wikimedia.org/r/604892 [23:40:00] Logged the message at https://wikitech.wikimedia.org/wiki/Release_Engineering/SAL [23:40:55] ejegg: I think you missed one :) [23:40:56] https://github.com/wikimedia/integration-config/blob/e5309775966884ed8cdb6c49aa0e5c0cce97a901/jjb/wm-fundraising.yaml#L90 [23:41:09] !log Reloading Zuul to deploy https://gerrit.wikimedia.org/r/604892 [23:41:17] 10Scap (Scap3-Adoption-Phase2), 10Toolforge: Setup a proper deployment strategy for Kubernetes - https://phabricator.wikimedia.org/T129311 (10bd808) [23:41:23] Logged the message at https://wikitech.wikimedia.org/wiki/Release_Engineering/SAL [23:42:51] (03PS1) 10Reedy: Remove ContributionTracking from fundraising-branches-php70 [integration/config] - 10https://gerrit.wikimedia.org/r/604919 [23:44:36] ejegg: ^ should I deploy that too? [23:45:48] (03PS1) 10Reedy: Stop branching ContributionTracking [tools/release] - 10https://gerrit.wikimedia.org/r/604924 [23:48:02] (03CR) 10Reedy: [C: 03+2] "buh-bye" [tools/release] - 10https://gerrit.wikimedia.org/r/604924 (owner: 10Reedy) [23:48:45] (03Merged) 10jenkins-bot: Stop branching ContributionTracking [tools/release] - 10https://gerrit.wikimedia.org/r/604924 (owner: 10Reedy) [23:49:58] (03CR) 10Reedy: [C: 03+2] Remove ContributionTracking from fundraising-branches-php70 [integration/config] - 10https://gerrit.wikimedia.org/r/604919 (owner: 10Reedy) [23:51:14] (03Merged) 10jenkins-bot: Remove ContributionTracking from fundraising-branches-php70 [integration/config] - 10https://gerrit.wikimedia.org/r/604919 (owner: 10Reedy) [23:55:51] thanks Reedy, that would be great! [23:59:53] ejegg: Should be all good now