summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lwirzenius@wikimedia.org>2019-05-06 16:50:57 +0300
committerLars Wirzenius <lwirzenius@wikimedia.org>2019-05-06 16:50:57 +0300
commitb254cffa2a3663b5ef7ff48cbeeb59460e967ff1 (patch)
tree1229867224ac83ce87ff781a7c2ded46708ae6c6
parent319db51ad1d0feee86753abf2a520074e81d73bc (diff)
downloadwmf-ci-arch-b254cffa2a3663b5ef7ff48cbeeb59460e967ff1.tar.gz
Add: note how the candidates were chosen
-rw-r--r--ci-arch.html2
-rw-r--r--ci-arch.mdwn3
-rw-r--r--ci-arch.pdfbin181515 -> 181568 bytes
3 files changed, 3 insertions, 2 deletions
diff --git a/ci-arch.html b/ci-arch.html
index 40d5844..4b25bca 100644
--- a/ci-arch.html
+++ b/ci-arch.html
@@ -47,7 +47,7 @@
</nav>
<h1 id="introduction">Introduction</h1>
<ul>
-<li><p>CI WG plans replacement of its current WMF CI system with one of Argo, GitLab CI, Zuul v3.</p></li>
+<li><p>CI WG plans replacement of its current WMF CI system with one of Argo, GitLab CI, Zuul v3. These were selected in the first phase of the CI WG.</p></li>
<li><p>We aim to do “continuous deployment”, not only “continous integration” or “continuous delivery”. The goal is to deploy changes to production as often and as quickly as possible, without compromising on the safety and security of the production environment.</p></li>
<li><p>This document goes into more detail of how the new CI system should work, without (yet) discussing which replacement is chosen. A meta-level architecture if you wish.</p></li>
<li><p>It is assumed as of the writing of this document that future CI will build on and deploy to containers orchestrated by Kubernetes.</p></li>
diff --git a/ci-arch.mdwn b/ci-arch.mdwn
index 281cc6e..86f7016 100644
--- a/ci-arch.mdwn
+++ b/ci-arch.mdwn
@@ -31,7 +31,8 @@ abstract: |
# Introduction
* CI WG plans replacement of its current WMF CI system with one of
- Argo, GitLab CI, Zuul v3.
+ Argo, GitLab CI, Zuul v3. These were selected in the first phase of
+ the CI WG.
* We aim to do "continuous deployment", not only "continous
integration" or "continuous delivery". The goal is to deploy changes
diff --git a/ci-arch.pdf b/ci-arch.pdf
index 4a09f8e..6765174 100644
--- a/ci-arch.pdf
+++ b/ci-arch.pdf
Binary files differ