Skip to content
Snippets Groups Projects
Commit e15bd362 authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'fix-docker-memory-check' into 'master'

Authenticate to Docker registry before running memory measurement

See merge request gitlab-org/omnibus-gitlab!3586
parents bcf34062 416d285c
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -23,7 +23,12 @@ module Gitlab
end
end
 
def authenticate
Docker.authenticate!(username: 'gitlab-ci-token', password: Gitlab::Util.get_env('CI_JOB_TOKEN'), serveraddress: Gitlab::Util.get_env('CI_REGISTRY'))
end
def measure
authenticate
container = start_docker_container
pid_command_hash_array, smem_result_hash_array = container_memory_usage_raw_data(container)
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment