@@ -4,29 +4,35 @@ allow_k8s_contexts(k8s_context()) # to unblock local() in local set-ups with a K
44
55docker_compose ('./docker-compose-dev.yml' )
66
7+ def resolve_env (var_name , default = None ):
8+ for line in str (read_file ('.env' )).splitlines ():
9+ if line .startswith (var_name + '=' ):
10+ return line .strip ().split ('=' , 1 )[1 ]
11+ return default
12+
713flow_ignore = ['flow/e2e/' , 'flow/**/*_test.go' ]
814
915docker_build ('flow-api' , '.' ,
1016 dockerfile = 'stacks/flow.Dockerfile' ,
11- target = 'flow-api-debug' if os . getenv ('DOCKER_GO_DEBUG_FLOW_API' ) == '1' else 'flow-api' ,
17+ target = 'flow-api-debug' if resolve_env ('DOCKER_GO_DEBUG_FLOW_API' ) == '1' else 'flow-api' ,
1218 only = ['flow/' , 'stacks/flow.Dockerfile' ],
1319 ignore = flow_ignore ,
14- build_args = {'PEERDB_VERSION_SHA_SHORT' : os .getenv ('PEERDB_VERSION_SHA_SHORT' , 'unknown' )},
20+ build_args = {'DEBUG_BUILD' : resolve_env ( 'DOCKER_GO_DEBUG_FLOW_API' , '' ), ' PEERDB_VERSION_SHA_SHORT' : os .getenv ('PEERDB_VERSION_SHA_SHORT' , 'unknown' )},
1521)
1622
1723docker_build ('flow-worker' , '.' ,
1824 dockerfile = 'stacks/flow.Dockerfile' ,
19- target = 'flow-worker-debug' if os . getenv ('DOCKER_GO_DEBUG_FLOW_WORKER' ) == '1' else 'flow-worker' ,
25+ target = 'flow-worker-debug' if resolve_env ('DOCKER_GO_DEBUG_FLOW_WORKER' ) == '1' else 'flow-worker' ,
2026 only = ['flow/' , 'stacks/flow.Dockerfile' ],
21- build_args = {'DEBUG_BUILD' : os . getenv ('DOCKER_GO_DEBUG_FLOW_WORKER' ,'' )},
27+ build_args = {'DEBUG_BUILD' : resolve_env ('DOCKER_GO_DEBUG_FLOW_WORKER' ,'' )},
2228 ignore = flow_ignore ,
2329)
2430
2531docker_build ('flow-snapshot-worker' , '.' ,
2632 dockerfile = 'stacks/flow.Dockerfile' ,
27- target = 'flow-snapshot-worker-debug' if os . getenv ('DOCKER_GO_DEBUG_FLOW_SNAPSHOT_WORKER' ) == '1' else 'flow-snapshot-worker' ,
33+ target = 'flow-snapshot-worker-debug' if resolve_env ('DOCKER_GO_DEBUG_FLOW_SNAPSHOT_WORKER' ) == '1' else 'flow-snapshot-worker' ,
2834 only = ['flow/' , 'stacks/flow.Dockerfile' ],
29- build_args = {'DEBUG_BUILD' : os . getenv ('DOCKER_GO_DEBUG_FLOW_SNAPSHOT_WORKER' ,'' )},
35+ build_args = {'DEBUG_BUILD' : resolve_env ('DOCKER_GO_DEBUG_FLOW_SNAPSHOT_WORKER' ,'' )},
3036 ignore = flow_ignore ,
3137)
3238
@@ -226,13 +232,6 @@ def connector_test(connector, extra_deps=[], vars_overrides={}):
226232 )
227233
228234# These are overrides to provide different MySQL flavors with the same test definitions.
229-
230- def resolve_env (var_name ):
231- for line in str (read_file ('.env' )).splitlines ():
232- if line .startswith (var_name + '=' ):
233- return line .strip ().split ('=' , 1 )[1 ]
234- return None
235-
236235mysql_gtid_vars = {
237236 'CI_MYSQL_PORT' : resolve_env ('CI_MYSQL_GTID_PORT' ),
238237 'CI_MYSQL_VERSION' : resolve_env ('CI_MYSQL_GTID_VERSION' ),
0 commit comments