summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lwirzenius@wikimedia.org>2019-05-02 19:09:37 +0300
committerLars Wirzenius <lwirzenius@wikimedia.org>2019-05-02 19:09:37 +0300
commit2dd97420fccdbc888a64cefc569a05da2dad1745 (patch)
treedd05bbca0aa182de656996ae1f172eb5100ddd5f
parent5be892932421cca99e9b621e1998f2d046a2760b (diff)
downloadwmf-ci-arch-2dd97420fccdbc888a64cefc569a05da2dad1745.tar.gz
Change: clarify MAINTAINED, merge UPSTREAM with it
-rw-r--r--ci-arch.mdwn7
1 files changed, 3 insertions, 4 deletions
diff --git a/ci-arch.mdwn b/ci-arch.mdwn
index ffb52fd..90dfd5f 100644
--- a/ci-arch.mdwn
+++ b/ci-arch.mdwn
@@ -96,7 +96,9 @@ TITLE: Future WMF CI architecture
* **(SECURE)** Must be secure enough that we can open it to community
developers to use without too much supervision.
-* **(MAINTAINED)** Must be maintained and supported upstream.
+* **(MAINTAINED)** Must be maintained and supported upstream. The CI
+ system should not require substantial development from the
+ Foundation. Some customization is expected to be necessary.
* **(MANYREPOS)** Must be able to handle the number of repositories,
projects, builds, and deployments that we have, and will have in the
@@ -181,9 +183,6 @@ TITLE: Future WMF CI architecture
* **(HOSTED)** Should have a hosted instance we can play with for
evaluation to avoid having to install everything from scratch.
-* **(UPSTREAM)** Should not require software development from the
- Foundation.
-
* **(BUILDINKUBERNETES)** Should allow builds to happen in K8s containers,
but probably should also support running jobs on bare metal or VMs.
For example, building Docker containers can't happen inside Docker