summaryrefslogtreecommitdiff
path: root/src/zuulv3/images
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2018-08-23 21:53:02 -0500
committerMonty Taylor <mordred@inaugust.com>2018-08-23 21:53:02 -0500
commit1f40de78d19e97f2b52446becbddb59a77516d15 (patch)
tree120e08e941dc38316c3184ca4d1e60a1ab48e698 /src/zuulv3/images
parent7c0b38f044dd7652dfc003fcfcfe8400493f10d8 (diff)
Import jim's changes to zuulv3 talk
Diffstat (limited to 'src/zuulv3/images')
-rw-r--r--src/zuulv3/images/architecture.ans38
-rw-r--r--src/zuulv3/images/orig/title.ans40
-rw-r--r--src/zuulv3/images/title.ans44
-rw-r--r--src/zuulv3/images/zuul.ans31
4 files changed, 75 insertions, 78 deletions
diff --git a/src/zuulv3/images/architecture.ans b/src/zuulv3/images/architecture.ans
index 0698ccc..ad308eb 100644
--- a/src/zuulv3/images/architecture.ans
+++ b/src/zuulv3/images/architecture.ans
@@ -4,42 +4,42 @@
4 4
5 5
6 6
7 ┌─────────────┐ 7 ┌─────────────┐
8 8
9 ┌───────┤ Zuul Merger │ 9 ┌───────┤ Zuul Merger │   
10 10
11 │ └──────┬──────┘ 11 ┌────┴───┐ └──┬───┬──────┘
12 12
13 │ │ 13 ┌──┤ Gerrit ├──┐ │ │
14 14
15 │ │ 15 │ └────────┘ │ ┌─┘ │
16 16
17  ┌────┴───┐ ┌──┴───┐ ┌───────────────┐ 17   │ ┌────────┐ │ │ ┌──┴───┐ ┌───────────────┐
18 18
19 ┌───────┤ Gerrit ├───────┤ Zuul ├─────┤ Zuul Executor │ 19 ┌─────┼──┤  Web  ├──┼────┤ Zuul ├─────┤ Zuul Executor │ 
20 20
21 ____ └────────┘ └──┬───┘ │ ┌───────┐ │ 21 ____ │ └────┬───┘ │ │ └──┬───┘ │ ┌───────┐ │
22 22
23 |... | │ │  │Ansible│ │  23 |... | │ ┌────┴───┐ │ │ │ │  │Ansible│ │
24 24
25 |... | │ └───┴───┬───┴───┘ 25 |... | ├──┤ GitHub ├──┼─┘ │ └───┴───┬───┴───┘
26 26
27/______\ ┌────┴─────┐ │ 27/______\ │ └────────┘ │ ┌────┴─────┐ │
28 28
29 o │ Nodepool │ │ 29 o │ ┌────────┐ │ │ Nodepool │ │
30 30
31 -|-   └────┬─────┘ │ 31 -|- └──┤ Finger ├──┘ └────┬─────┘ │
32 32
33 / \ │ │ 33 / \ └────────┘ │ │
34 34
35 Dev Cloud │  │ 35 Dev Cloud │  │
36 36
37  Node 1 ─────────────┤ 37  Node 1 ─────────────┤
38 38
39  ...  │ 39  ...  │
40 40
41  Node 2 ─────────────┘ 41  Node 2 ─────────────┘
42 42
43(Not to scale)   43(Not to scale)  
44 44
45 \ No newline at end of file 45 \ No newline at end of file
diff --git a/src/zuulv3/images/orig/title.ans b/src/zuulv3/images/orig/title.ans
index 82ef305..8442c58 100644
--- a/src/zuulv3/images/orig/title.ans
+++ b/src/zuulv3/images/orig/title.ans
@@ -1,42 +1,40 @@
1 ______________ .. .. ______________ 1͵
2 2
3( (  \ \_____)____(_____/ /  ) ) 3 Ĵ
4 4
5 \ ) `'   `' ( / 5 
6 6
7 )/   \( 7
8
9 /'  REST APIs and the Return of the  `\ 
10 8
11O   ___ ___ _ _ ___ ___ _ ___   O 9
12 10
13  / __/ _ \| \| / __|/ _ \| | | __|  11
14 12
15 | (_| (_) | .` \__ \ (_) | |__| _|   13  _____ _
16 14
17  \___\___/|_|\_|___/\___/|____|___|  15 |__ / _ _ _| |
18 16
19  17 / / | | | | | | |
20 18
21 Application  19 / /| |_| | |_| | |
22 20
23  21 /____\__,_|\__,_|_|
24 22
25O  James E. Blair <corvus@inaugust.com>  O 23
26 24
27 \. ./  25
28 26
29 )\  ,____ ____,  /( 27
30 28
31 / ) / ____\ ____ /____ \ ( \ 29
32 30
33( (_________/_/ ) ( \_\_________) ) 31
34 32
35 ~-'  `' `'  `-~  33 
36 34
37 35 Ĵ
38 36
39 37͵
40 38
41 39
42 40
diff --git a/src/zuulv3/images/title.ans b/src/zuulv3/images/title.ans
index c784327..8857086 100644
--- a/src/zuulv3/images/title.ans
+++ b/src/zuulv3/images/title.ans
@@ -1,45 +1,47 @@
1 ______________ .──. .──. ______________ 1══════════════════════╡│││╞═════════════════════
2 2
3( (  \ \_____)____(_____/ /  ) ) 3 ────────────────────┤│├───────────────────
4 4
5 \ ) `─────'   `─────' ( / 5 ──────────────────│─────────────────
6 6
7 )/   \( 7
8
9 /'  REST APIs and the Return of the  `\ 
10 8
11O   ___ ___ _ _ ___ ___ _ ___   O 9
12 10
13│  / __/ _ \| \| / __|/ _ \| | | __| │ 11
14 12
15│ | (_| (_) | .` \__ \ (_) | |__| _|  │ 13  _____ _
16 14
17│  \___\___/|_|\_|___/\___/|____|___| │ 15 |__ / _ _ _| |
18 16
19│ │ 17 / / | | | | | | |
20 18
21│ Application │ 19 / /| |_| | |_| | |
22 20
23│ │ 21 /____\__,_|\__,_|_|
24 22
25O  James E. Blair <corvus@inaugust.com>  O 23
26 24
27 \. ./  25
28 26
29 )\  ,____ ____,  /( 27 Monty Taylor
30 28
31 / ) / ____\ ____ /____ \ ( \ 29 irc: mordred
32 30
33( (_________/_/ ) ( \_\_________) ) 31 twitter: @e_monty
34 32
35 ~-'  `──' `──'  `-~  33 Red Hat
36 34
37 35
38 36
39 37 ──────────────────│─────────────────
38
39 ────────────────────┤│├───────────────────
40
41══════════════════════╡│││╞═════════════════════
40 42
41 43
42 44
43 45
44 46
45 \ No newline at end of file 47
diff --git a/src/zuulv3/images/zuul.ans b/src/zuulv3/images/zuul.ans
index 6369083..44094b8 100644
--- a/src/zuulv3/images/zuul.ans
+++ b/src/zuulv3/images/zuul.ans
@@ -9,28 +9,25 @@
9 9
10 10
11 11
12 12
13  _____ _ 13 ╱╲
14 14 ╱ ╲
15 |__ / _ _ _| | 15 ────────────────
16 16 ╲┌─┬────────┬─┐╱
17 / / | | | | | | | 17 ├─┼────────┼─┤
18 18 ╱│ │ ▏ │ │╲
19 / /| |_| | |_| | | 19 ╱ │ │ ▏ │ │ ╲
20 20 ╱ │ │ ▏ │ │ ╲
21 /____\__,_|\__,_|_| 21 ╱ │ │ ▏ │ │ ╲
22 22 ────┴─┴────────┴─┴────
23 23
24 24 Z U U L
25
26 25
27 26
28 27
29 28
30 29
31 30 ──────────────────│─────────────────
32
33 ──────────────────│─────────────────
34 31
35 ────────────────────┤│├─────────────────── 32 ────────────────────┤│├───────────────────
36 33
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 18:29:36 +0000