Change: clarify the FREESOFTWARE requirement and make it a subreq

1 files changed, 10 insertions, 4 deletions

diff --git a/ci-arch.mdwn b/ci-arch.mdwn
index 3b8da3b..faf7342 100644
--- a/ci-arch.mdwn
+++ b/ci-arch.mdwn
@@ -38,13 +38,16 @@ TITLE: Future WMF CI architecture
 * These are non-negotiable requirement that must all be fulfilled by a
   our future CI system.
 
-* **(FREESOFTWARE)** Must be free software / open source. "Open core" like
-  GitLab is be good enough, as long as we only need the parts that
-  provide software freedom.
-
 * **(SELFHOSTABLE)** Must be hostable by the Foundation. It's not
   acceptable for WMF to rely on an outside service for this.
 
+    * **(FREESOFTWARE)** Must be free software / open source. "Open
+      core" like GitLab is be good enough, as long as we only need the
+      parts that provide software freedom.
+
+      This is partly due to the **SELFHOSTABLE** requirement, but also
+      because a WMF value is to prefer open source.
+
 * **(GITSUPPORT)** Must support git. We're not switching version control
   systems for CI.
 
@@ -78,6 +81,9 @@ TITLE: Future WMF CI architecture
   stages ("can get source from git", "can build", "can run unit
   tests", etc.).
 
+* **(FEEDBACK2)** Must support providing feedback via Gerrit, IRC, and
+  Phabricator, at the very least.
+
 * **(SECURE)** Must be secure enough that we can open it to community
   developers to use without too much supervision.