roadmap/2021.md

@@ -38,9 +38,6 @@ attention. In general, the over-arching goals are therefore:
  * retire old services:
    * SVN ([issue 17202](https://gitlab.torproject.org/tpo/tpa/team/-/issues/17202))
    * fpcentral ([issue 40009](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40009))
-   * gitolite (replaced with GitLab, see above)
-   * gitweb (replaced with GitLab, see above)
-   * jenkins (replaced with GitLab, see above)
  * scale GitLab with ongoing and surely expanding usage
    * possibly split in multiple server
    * throw more hardware at it?
@@ -48,8 +45,6 @@ attention. In general, the over-arching goals are therefore:
  * provide reliable and simple continuous integration services
    * retire Jenkins
    * replace with GitLab CI, with Windows, Mac and Linux runners
- * avoid duplicate git hosting infrastructure
-   * retire gitolite, gitweb ([issue 36](https://gitlab.torproject.org/tpo/tpa/gitlab/-/issues/36))
  * fix the blog moderation and comment moderation, possible solutions:
    * migrate to a static website and Discourse
    * fix formatting and improve moderation within Drupal
@@ -63,6 +58,10 @@ attention. In general, the over-arching goals are therefore:
    * move root@ and tpa "noise" to RT ([ticket 31242]( https://gitlab.torproject.org/tpo/tpa/team/-/issues/31242)), make a real
      mailing list for admins so that gaba and non-tech can join
  * plan for hiro's vacation (replacement?)
+ * be realistic:
+   * cover for the day-to-day routine tasks
+   * reserve time for the unexpected
+   * reduce expectations
 
 ## Nice to have
 
@@ -72,9 +71,14 @@ attention. In general, the over-arching goals are therefore:
    * reduce dependency on Python 2 code (see [short term LDAP plan](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/ldap#short-term-merge-with-upstream-port-to-python-3-if-necessary))
    * reduce dependency on LDAP (move hosts to Puppet? see [mid term
      LDAP plan](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/ldap#mid-term-move-hosts-to-puppet-possibly-replace-ud-ldap-with-simpler-dashboard))
+ * avoid duplicate git hosting infrastructure
+   * retire gitolite, gitweb ([issue 36](https://gitlab.torproject.org/tpo/tpa/gitlab/-/issues/36))
  * retire more old services:
    * testnet?
    * schleuder?
+   * gitolite (replaced with GitLab, see above)
+   * gitweb (replaced with GitLab, see above)
+   * jenkins (replaced with GitLab, see above)
  * provide secure, end-to-end authentication of Tor source code
    ([issue 81](https://gitlab.torproject.org/tpo/tpa/gitlab/-/issues/81))
  * finish retiring old hardware (moly, [ticket 29974](https://gitlab.torproject.org/legacy/trac/-/issues/29974))