Skip to content

Commit b6891cc

Browse files
nuclearcatnuclearcat
committed
(docker-compose): Prepare staging for workflows
To prepare for workflows we need to ignore local sources, and use docker staging images built in github workflows. Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>
1 parent b653e27 commit b6891cc

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

‎docker-compose.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ services:
1010

1111
monitor: &base-service
1212
container_name: 'kernelci-pipeline-monitor'
13-
image: 'kernelci/staging-kernelci'
13+
image: 'kernelci/staging-kernelci:pipeline'
1414
env_file: ['.env']
1515
stop_signal: 'SIGINT'
1616
command:
17-
- './pipeline/monitor.py'
17+
- './src/monitor.py'
1818
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
1919
- 'run'
2020
volumes: &base-volumes
21-
- './src:/home/kernelci/pipeline'
21+
# - './src:/home/kernelci/pipeline'
2222
- './config:/home/kernelci/config'
2323
- './logs:/home/kernelci/logs'
2424
extra_hosts:
@@ -27,34 +27,34 @@ services:
2727

2828
result_summary:
2929
container_name: 'kernelci-pipeline-result-summary'
30-
image: 'kernelci/staging-kernelci'
30+
image: 'kernelci/staging-kernelci:pipeline'
3131
env_file: ['.env']
3232
stop_signal: 'SIGINT'
3333
entrypoint:
34-
- './pipeline/result_summary.py'
34+
- './src/result_summary.py'
3535
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
3636
- 'run'
3737
- '--config=${CONFIG:-/home/kernelci/config/result-summary.yaml}'
3838
volumes:
39-
- './src:/home/kernelci/pipeline'
39+
# - './src:/home/kernelci/pipeline'
4040
- './config:/home/kernelci/config'
4141
- './data/output:/home/kernelci/data/output'
4242
- './logs:/home/kernelci/logs'
4343
#restart: on-failure
4444

4545
scheduler: &scheduler
4646
container_name: 'kernelci-pipeline-scheduler'
47-
image: 'kernelci/staging-kernelci'
47+
image: 'kernelci/staging-kernelci:pipeline'
4848
env_file: ['.env']
4949
stop_signal: 'SIGINT'
5050
command:
51-
- './pipeline/scheduler.py'
51+
- './src/scheduler.py'
5252
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
5353
- 'loop'
5454
- '--runtimes=shell'
5555
- '--name=scheduler'
5656
volumes:
57-
- './src:/home/kernelci/pipeline'
57+
# - './src:/home/kernelci/pipeline'
5858
- './config:/home/kernelci/config'
5959
- './data/output:/home/kernelci/data/output'
6060
- './data/k8s-credentials/.kube:/home/kernelci/.kube'
@@ -69,15 +69,15 @@ services:
6969
<<: *scheduler
7070
container_name: 'kernelci-pipeline-scheduler-docker'
7171
user: root # Docker-in-Docker
72-
working_dir: /home/kernelci
72+
#working_dir: /home/kernelci
7373
command:
74-
- './pipeline/scheduler.py'
74+
- './src/scheduler.py'
7575
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
7676
- 'loop'
7777
- '--runtimes=docker'
7878
- '--name=scheduler_docker'
7979
volumes:
80-
- './src:/home/kernelci/pipeline'
80+
# - './src:/home/kernelci/pipeline'
8181
- './config:/home/kernelci/config'
8282
- './data/output:/home/kernelci/data/output'
8383
- './.docker-env:/home/kernelci/.docker-env'
@@ -90,7 +90,7 @@ services:
9090
<<: *scheduler
9191
container_name: 'kernelci-pipeline-scheduler-lava'
9292
command:
93-
- './pipeline/scheduler.py'
93+
- './src/scheduler.py'
9494
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
9595
- 'loop'
9696
- '--name=scheduler_lava'
@@ -108,9 +108,9 @@ services:
108108
scheduler-k8s:
109109
<<: *scheduler
110110
container_name: 'kernelci-pipeline-scheduler-k8s'
111-
image: 'kernelci/staging-k8s:kernelci'
111+
image: 'kernelci/staging-kernelci:pipeline'
112112
command:
113-
- './pipeline/scheduler.py'
113+
- './src/scheduler.py'
114114
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
115115
- 'loop'
116116
- '--name=scheduler_k8s'
@@ -124,12 +124,12 @@ services:
124124
<<: *base-service
125125
container_name: 'kernelci-pipeline-tarball'
126126
command:
127-
- './pipeline/tarball.py'
127+
- './src/tarball.py'
128128
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
129129
- 'run'
130130
- '--name=tarball'
131131
volumes:
132-
- './src:/home/kernelci/pipeline'
132+
# - './src:/home/kernelci/pipeline'
133133
- './config:/home/kernelci/config'
134134
- './data/ssh:/home/kernelci/data/ssh'
135135
- './data/src:/home/kernelci/data/src'
@@ -142,7 +142,7 @@ services:
142142
<<: *base-service
143143
container_name: 'kernelci-pipeline-trigger'
144144
command:
145-
- './pipeline/trigger.py'
145+
- './src/trigger.py'
146146
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
147147
- 'run'
148148
- '--trees=kernelci,netdev-testing'
@@ -156,7 +156,7 @@ services:
156156
command:
157157
- '/usr/bin/env'
158158
- 'python3'
159-
- '/home/kernelci/pipeline/regression_tracker.py'
159+
- '/home/kernelci/pipeline/src/regression_tracker.py'
160160
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
161161
- 'run'
162162
extra_hosts:
@@ -168,7 +168,7 @@ services:
168168
command:
169169
- '/usr/bin/env'
170170
- 'python3'
171-
- '/home/kernelci/pipeline/test_report.py'
171+
- '/home/kernelci/pipeline/src/test_report.py'
172172
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
173173
- 'loop'
174174
extra_hosts:
@@ -180,7 +180,7 @@ services:
180180
command:
181181
- '/usr/bin/env'
182182
- 'python3'
183-
- '/home/kernelci/pipeline/timeout.py'
183+
- '/home/kernelci/pipeline/src/timeout.py'
184184
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
185185
- 'run'
186186
- '--mode=timeout'
@@ -193,7 +193,7 @@ services:
193193
command:
194194
- '/usr/bin/env'
195195
- 'python3'
196-
- '/home/kernelci/pipeline/timeout.py'
196+
- '/home/kernelci/pipeline/src/timeout.py'
197197
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
198198
- 'run'
199199
- '--mode=closing'
@@ -206,7 +206,7 @@ services:
206206
command:
207207
- '/usr/bin/env'
208208
- 'python3'
209-
- '/home/kernelci/pipeline/timeout.py'
209+
- '/home/kernelci/pipeline/src/timeout.py'
210210
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
211211
- 'run'
212212
- '--mode=holdoff'
@@ -217,12 +217,12 @@ services:
217217
<<: *base-service
218218
container_name: 'kernelci-pipeline-patchset'
219219
command:
220-
- './pipeline/patchset.py'
220+
- './src/patchset.py'
221221
- '--settings=${KCI_SETTINGS:-/home/kernelci/config/kernelci.toml}'
222222
- 'run'
223223
- '--name=patchset'
224224
volumes:
225-
- './src:/home/kernelci/pipeline'
225+
# - './src:/home/kernelci/pipeline'
226226
- './config:/home/kernelci/config'
227227
- './data/ssh:/home/kernelci/data/ssh'
228228
- './data/src:/home/kernelci/data/src'

0 commit comments

Comments
 (0)