Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mikhail-klimko committed Jun 19, 2024
1 parent c89ebfb commit 8c016b1
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ runtimeScheduler:
envVars:
{{- with $engineContext.env }}
{{- range $key, $val := . }}
{{- if or (kindIs "bool" $val) }}
{{ $key }}: {{ $val | squote }}
{{- else }}
{{ $key }}: {{ $val }}
{{- end }}
{{- end }}
{{- end }}
COMPOSE_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.COMPOSE_IMAGE) | squote }}
Expand Down Expand Up @@ -93,7 +97,11 @@ dockerDaemonScheduler:
{{- with $dindContext.env }}
envVars:
{{- range $key, $val := . }}
{{- if or (kindIs "bool" $val) }}
{{ $key }}: {{ $val | squote }}
{{- else }}
{{ $key }}: {{ $val }}
{{- end }}
{{- end }}
{{- end }}
cluster:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ tests:
- run
- start
envVars:
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: 1000
FORCE_COMPOSE_SERIAL_PULL: 'false'
LOGGER_LEVEL: 'debug'
LOGGER_LEVEL: debug
LOG_OUTGOING_HTTP_REQUESTS: 'false'
METRICS_PROMETHEUS_ENABLED: 'true'
COMPOSE_IMAGE: 'somedomain.io/codefresh/compose:tagoverride'
Expand Down
8 changes: 4 additions & 4 deletions charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ tests:
- two
- three
envVars:
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
FOO: 'BAR'
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: 1000
FOO: BAR
FORCE_COMPOSE_SERIAL_PULL: 'false'
LOGGER_LEVEL: 'debug'
LOGGER_LEVEL: debug
LOG_OUTGOING_HTTP_REQUESTS: 'false'
METRICS_PROMETHEUS_ENABLED: 'true'
COMPOSE_IMAGE: 'quay.io/codefresh/compose:tagoverride'
Expand Down Expand Up @@ -108,7 +108,7 @@ tests:
imagePullPolicy: IfNotPresent
userAccess: true
envVars:
ALICE: 'BOB'
ALICE: BOB
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: 'true'
cluster:
namespace: codefresh
Expand Down
8 changes: 4 additions & 4 deletions charts/cf-runtime/tests/runtime/runtime_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ tests:
- two
- three
envVars:
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
FOO: 'BAR'
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: 1000
FOO: BAR
FORCE_COMPOSE_SERIAL_PULL: 'false'
LOGGER_LEVEL: 'debug'
LOGGER_LEVEL: debug
LOG_OUTGOING_HTTP_REQUESTS: 'false'
METRICS_PROMETHEUS_ENABLED: 'true'
COMPOSE_IMAGE: 'quay.io/codefresh/compose:tagoverride'
Expand Down Expand Up @@ -118,7 +118,7 @@ tests:
imagePullPolicy: Always
userAccess: true
envVars:
ALICE: 'BOB'
ALICE: BOB
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: 'true'
cluster:
namespace: codefresh
Expand Down
4 changes: 2 additions & 2 deletions charts/cf-runtime/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ runtime:
reuseVolumeSortOrder: pipeline_id
# -- Set additional env vars.
env:
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: true
# -- Set pod annotations.
podAnnotations: {}
# -- Set pod labels.
Expand Down Expand Up @@ -539,7 +539,7 @@ runtime:
# -- If "true", composition images will be pulled sequentially
FORCE_COMPOSE_SERIAL_PULL: false
# -- Level of logging for engine
LOGGER_LEVEL: "debug"
LOGGER_LEVEL: debug
# -- Enable debug-level logging of outgoing HTTP/HTTPS requests
LOG_OUTGOING_HTTP_REQUESTS: false
# -- Enable emitting metrics from engine
Expand Down

0 comments on commit 8c016b1

Please sign in to comment.