The website for https://integration.wikimedia.org is in integration/docroot.git which is cloned at /srv
/srv belongs to root:root and also is a place for different materials such as the jenkins build history or zuul git repositories.
I had to manually hack /srv to be owned by jenkins-slave. It should be made back to root:root AND the .git repo should be cloned one level deeper instead of directly in /srv. A good candidate would be /srv/docroot.
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Resolved | hashar | T149924 Clear /srv/.git on contint1001; move integration.wikimedia.org docroot to new location | |||
| Resolved | hashar | T256005 Move integration/docroot.git deployment to scap | |||
| Resolved | • ema | T256138 Create ssh keypair for integration/docroot deployment with scap | |||
| Resolved | hashar | T257316 scap::target failed to clone a new deployment repository | |||
| Resolved | jcrespo | T257329 After arming a new key in keyholder, the identity file path does not show up | |||
| Resolved | hashar | T257319 scap deploy --init fails on the spare deployment server due to a global scap lock being held | |||
| Resolved | hashar | T257413 scap configuration in puppet defaults to forge the git repo name with 'mediawiki/services/' | |||
| Open | None | T257317 scap deploy --init on deployment server fails on first puppet run |
Change 480828 had a related patch set uploaded (by Hashar; owner: Hashar):
[integration/docroot@master] scap configuration for deployment
Change 480879 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: clone integration/docroot
Change 480881 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: relocate from /srv to /srv/docroot
Will be addressed as we migrate the documentation hosting to a new host. I am intending to have integration/docroot.git to be cloned to /srv/docroot which can thus be owned by someone else than the root user.
Change 480879 merged by Dzahn:
[operations/puppet@production] doc: clone integration/docroot
puppet created the dir and git clone contents after the merge above:
[doc1001:/srv/docroot] $ ls total 60K 4.0K drwxrwsr-x 6 nobody wikidev 4.0K Dec 20 00:51 . 4.0K drwxr-xr-x 4 root root 4.0K Dec 20 00:51 .. 4.0K -rw-rw-r-- 1 nobody wikidev 326 Dec 20 00:51 composer.json 4.0K drwxrwsr-x 8 nobody wikidev 4.0K Dec 20 00:51 .git 4.0K -rw-rw-r-- 1 nobody wikidev 356 Dec 20 00:51 .gitignore 4.0K -rw-rw-r-- 1 nobody wikidev 99 Dec 20 00:51 .gitreview ..
Change 480881 merged by Dzahn:
[operations/puppet@production] doc: relocate from /srv to /srv/docroot
moved the files around on doc1001, but this one did not change things on contint* yet
I am leaving contint1001 as is :) The task would thus be solved once we switch doc.wikimedia.org hosting to doc1001.eqiad.wmnet.
Thanks for all the patches
https://doc.wikimedia.org/ is now served by doc1001.eqiad.wmnet. integration/docroot is cloned to /srv/docroot.
On contint1001 the old doc still has to be cleaned out, then we have to migrate https://integration.wikimedia.org/ document root to /srv/docroot as well.
As disussed on IRC, i'd rather not use /srv/docroot and would prefer instead if we can clean out the repo called "docroot" to actually just contain files for the docroot.
As opposed to extra files outside the docroot / mixing of doc.wm.org and integration.wm.org which got separated meanwhile and including more files from a common directory that is also outside of it.
Let's simplify and have a single docroot repo for a single site and then we can git clone to /srv/org/wikimedia/integration as expected to work at https://gerrit.wikimedia.org/r/c/operations/puppet/+/595525
During the migration attempts of contint2001 this popped up again when the integration.wikimedia.org docroot was empty and we are now living again with a manual hack that needs to be fixed properly.
Change 595525 had a related patch set uploaded (by Dzahn; owner: Dzahn):
[operations/puppet@production] contint: fix git cloning of docroot for integration.wm.org
Change 607041 had a related patch set uploaded (by Hashar; owner: Hashar):
[integration/config@master] Stop autodeployment of integration/docroot
Change 595525 abandoned by Hashar:
contint: fix git cloning of docroot for integration.wm.org
Reason:
The way we deploy integration/docroot and maintain its deployment is broken. Instead we will migrate the deployment to use scap (T256005) and have Apache DocumentRoot to point to the deployed path under /srv/deployment. That will also addresses the issue Daniel raised to me: the git workspace is polluted by files published by CI.
Change 607076 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] ci: switch integration.wikimedia.org to scap DocumentRoot
For doc.wikimedia.org it is a bit scary. The org/wikimedia/doc path serves as a DocumentRoot and has plenty of script there for the homepage. We have CI populate the generated documentation directly into it.
I though I could Alias /doc/ to the scap deployed repository, but then the published documentation will no more be available. So I guess I have to find a solution using mod_rewrite to have file not found to be looked up in the directory under which files are published.
Eventually the published documentations should be relocated to a new place /srv/doc with bacula adjusted to use it as well as the rsync doc module.
It is not that complicated, but not that trivial. I fought a bit with mod_rewrite today but have hit a wall. So I guess I will try again later.
Change 607076 merged by Cwhite:
[operations/puppet@production] ci: switch integration.wikimedia.org to scap DocumentRoot
Change 611369 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] ci: switch integration.wikimedia.org to scap DocumentRoot
Change 611377 had a related patch set uploaded (by Hashar; owner: Hashar):
[integration/docroot@master] Support DOCUMENT_ROOT being a symbolic link
Change 611377 merged by jenkins-bot:
[integration/docroot@master] Support DOCUMENT_ROOT being a symbolic link
Mentioned in SAL (#wikimedia-operations) [2020-07-28T10:56:33Z] <hashar@deploy1001> Started deploy [integration/docroot@ba85bdf]: Catch up with HEAD and support DOCUMENT_ROOT being a symbolic link for T149924
Mentioned in SAL (#wikimedia-operations) [2020-07-28T10:56:40Z] <hashar@deploy1001> Finished deploy [integration/docroot@ba85bdf]: Catch up with HEAD and support DOCUMENT_ROOT being a symbolic link for T149924 (duration: 00m 06s)
Change 620368 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: switch to scap DocumentRoot
Change 620389 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: prepare /srv/doc as the new destination
Change 611369 merged by Dzahn:
[operations/puppet@production] ci: switch integration.wikimedia.org to scap DocumentRoot
Mentioned in SAL (#wikimedia-operations) [2020-08-20T19:07:22Z] <mutante> switching document root of integration.wikimedia.org to scap (T149924)
No, still have to switch doc.wikimedia.org document root, but that requires a few more patches. It is not as trivial unfortunately.
Change 620389 merged by Jcrespo:
[operations/puppet@production] doc: prepare /srv/doc as the new destination
Change 621707 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: set WMF_DOC_PATH environment variable
Change 621720 had a related patch set uploaded (by Hashar; owner: Hashar):
[integration/docroot@master] Support published documents outside of the git checkout
Change 621707 merged by Dzahn:
[operations/puppet@production] doc: set WMF_DOC_PATH environment variable
Mentioned in SAL (#wikimedia-releng) [2020-08-24T07:40:46Z] <hashar> contint2001: removed checkout of integration/docroot.git which was at /srv # T149924
Change 622140 had a related patch set uploaded (by Hashar; owner: Hashar):
[integration/docroot@master] build: helpers to start php builtin server
Change 622323 had a related patch set uploaded (by Hashar; owner: Hashar):
[integration/docroot@master] shared: abstract out realpath check
Change 622606 had a related patch set uploaded (by Hashar; owner: Hashar):
[integration/config@master] Stop autodeploy of integration/docroot
Change 622606 abandoned by Hashar:
[integration/config@master] Stop autodeploy of integration/docroot
Reason:
dupe of https://gerrit.wikimedia.org/r/c/integration/config/ /607041
Change 622140 merged by jenkins-bot:
[integration/docroot@master] build: run integration on a different port
Change 622323 merged by jenkins-bot:
[integration/docroot@master] shared: abstract out realpath check
Change 621720 merged by jenkins-bot:
[integration/docroot@master] Support published documents outside of the git checkout
Mentioned in SAL (#wikimedia-operations) [2020-09-07T13:27:57Z] <hashar@deploy1001> Started deploy [integration/docroot@e4e3af9]: Support published documents outside of the git checkout # T149924
Mentioned in SAL (#wikimedia-operations) [2020-09-07T13:28:03Z] <hashar@deploy1001> Finished deploy [integration/docroot@e4e3af9]: Support published documents outside of the git checkout # T149924 (duration: 00m 05s)
Change 625644 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: relocate published documents to /srv/doc
Change 625649 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: stop backup for old doc directory
Change 625650 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: remove legacy doc directory
Change 620368 merged by Dzahn:
[operations/puppet@production] doc: switch to scap DocumentRoot
Change 647763 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: switch to scap DocumentRoot
Change 648247 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: use an Apache Define for WMF_DOC_PATH
Change 648248 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] doc: fix fallback to WMF_DOC_PATH files
Change 648247 merged by Dzahn:
[operations/puppet@production] doc: use an Apache Define for WMF_DOC_PATH
Change 648339 had a related patch set uploaded (by Dzahn; owner: Dzahn):
[operations/puppet@production] httpbb/doc: add tests for doc.wikimedia.org
Change 648339 merged by Dzahn:
[operations/puppet@production] httpbb/doc: add tests for doc.wikimedia.org
Change 648248 merged by Dzahn:
[operations/puppet@production] doc: fix fallback to WMF_DOC_PATH files
Change 647763 merged by Dzahn:
[operations/puppet@production] doc: switch to scap DocumentRoot [take 2]
Change 625644 merged by Dzahn:
[operations/puppet@production] doc: relocate published documents to /srv/doc
Change 650214 had a related patch set uploaded (by Hashar; owner: Hashar):
[operations/puppet@production] bacula: remove unused srv-docroot-org-wikimedia-doc
Change 625649 merged by Dzahn:
[operations/puppet@production] doc: unconfigure legacy backup::set
Change 625650 merged by Dzahn:
[operations/puppet@production] doc: remove legacy doc directory
This is finally done. It has been quite an adventure done over several sprints. On top of my head:
Huge thank you to @Dzahn for providing all the expertise and assistance to make it a success! That removes the oldest CI technical debt we had floating around and we are in a much much better shape now.
Change 650214 merged by Dzahn:
[operations/puppet@production] bacula: remove unused srv-docroot-org-wikimedia-doc
And I have updated the online doc to mention we are now fully using scap to deploy. https://www.mediawiki.org/w/index.php?title=Continuous_integration/Documentation_generation&diff=4289247&oldid=4018253&diffmode=source