Change: elevate HA, CLEANWORKSPACE, SECRETS to hard req

3 files changed, 12 insertions, 11 deletions

diff --git a/ci-arch.html b/ci-arch.html
index bb453dc..76ab672 100644
--- a/ci-arch.html
+++ b/ci-arch.html
@@ -148,17 +148,17 @@
 <li><p><strong>ONCALL</strong>: There must be multiple, named people who can be alerted to deal with problems in CI that users can’t deal with themselves. These people need to cover enough time zones to be available at almost all times, and have enough overlap to cover for each other when they’re not availble due to illness, vacation, travel, or such reasons.</p></li>
 <li><p><strong>SLA</strong>: RelEng provides a promise, similar to a service-level agreement, for how well CI serves WMF and the movement.</p></li>
 </ul></li>
+<li><p><strong>HA</strong> Must be highly available - can restart any component without disrupting service.</p></li>
+<li><p><strong>CLEANWORKSPACE</strong> Must provide a clean workspace for each build or test run - either a clean VM or container.</p></li>
+<li><p><strong>SECRETS</strong> Must support secure storage of credentials / secrets.</p></li>
 </ul>
 <h2 id="softer-requirements">Softer requirements</h2>
 <p>These requirements are even more easily negotiated.</p>
 <ul>
-<li><p><strong>HA</strong> Should be highly available - can restart any component without disrupting service.</p></li>
 <li><p><strong>LIVELOG</strong> Should have live console output of build.</p></li>
 <li><p><strong>MAXBUILDTIME</strong> Should have build timeouts so that a build may fail if it takes too long. Among other reasons, this is useful to automatically work around builds that get “stuck” indefinitely.</p></li>
-<li><p><strong>CLEANWORKSPACE</strong> Should provide a clean workspace for each test run - either a clean VM or container.</p></li>
 <li><p><strong>RATELIMIT</strong> Should have rate limiting - one user/project can not take over most/all resources.</p></li>
 <li><p><strong>CHECKSIG</strong> Should support validation and creation of GPG/PGP-signed git commits</p></li>
-<li><p><strong>SECRETS</strong> Should support secure storage of credentials / secrets.</p></li>
 </ul>
 <h2 id="would-be-nice">Would be nice</h2>
 <p>These are so soft they aren’t even requirements, and more wish list items.</p>
diff --git a/ci-arch.mdwn b/ci-arch.mdwn
index dbe19bc..cd052f2 100644
--- a/ci-arch.mdwn
+++ b/ci-arch.mdwn
@@ -321,30 +321,31 @@ to a minor degree.
     * **SLA**: RelEng provides a promise, similar to a service-level
       agreement, for how well CI serves WMF and the movement.
 
+* **HA** Must be highly available - can restart any component without
+  disrupting service.
+
+* **CLEANWORKSPACE** Must provide a clean workspace for each build or
+  test run - either a clean VM or container.
+
+* **SECRETS** Must support secure storage of credentials / secrets.
+
+
 ## Softer requirements
 
 These requirements are even more easily negotiated.
 
-* **HA** Should be highly available - can restart any component without
-  disrupting service.
-
 * **LIVELOG** Should have live console output of build.
 
 * **MAXBUILDTIME** Should have build timeouts so that a build may
   fail if it takes too long. Among other reasons, this is useful to
   automatically work around builds that get "stuck" indefinitely.
 
-* **CLEANWORKSPACE** Should provide a clean workspace for each test
-  run - either a clean VM or container.
-
 * **RATELIMIT** Should have rate limiting - one user/project can not
   take over most/all resources.
 
 * **CHECKSIG** Should support validation and creation of GPG/PGP-signed
   git commits
 
-* **SECRETS** Should support secure storage of credentials / secrets.
-
 ## Would be nice
 
 These are so soft they aren't even requirements, and more wish list
diff --git a/ci-arch.pdf b/ci-arch.pdf
index 6bd9b94..f79759f 100644
--- a/ci-arch.pdf
+++ b/ci-arch.pdf