diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-06-28 18:55:54 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-06-28 18:55:54 +0300 |
| commit | 7c38c0b4b2e43ae86ca32ea3363707e89544152f (patch) | |
| tree | 3c56ac3ef0a25368929a6d9453ff92ccc8955ddc /scripts | |
| parent | fd5772a8ff96e576a640edcc8dc49fd8625ab002 (diff) | |
Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"
This reverts merge request !30031
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/generate-memory-metrics-on-boot | 11 | ||||
| -rw-r--r-- | scripts/prepare_build.sh | 9 |
2 files changed, 4 insertions, 16 deletions
diff --git a/scripts/generate-memory-metrics-on-boot b/scripts/generate-memory-metrics-on-boot deleted file mode 100755 index 5197a8fcdcd..00000000000 --- a/scripts/generate-memory-metrics-on-boot +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env ruby - -abort "usage: #{__FILE__} <memory_bundle_mem_file_name>" unless ARGV.length == 1 -memory_bundle_mem_file_name = ARGV.first - -full_report = File.open(memory_bundle_mem_file_name).read - -stats = /TOP: (?<total_mibs_str>.*) MiB/.match(full_report) -abort 'failed to process the benchmark output' unless stats - -puts "total_memory_used_by_dependencies_on_boot_prod_env_mb #{stats[:total_mibs_str].to_f.round(1)}" diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index c1cade0a820..9b0d5d4f719 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -35,7 +35,6 @@ sed -i 's/username: root/username: gitlab/g' config/database.yml if [ "$GITLAB_DATABASE" = 'postgresql' ]; then sed -i 's/localhost/postgres/g' config/database.yml - sed -i 's/username: git/username: postgres/g' config/database.yml if [ -f config/database_geo.yml ]; then sed -i 's/localhost/postgres/g' config/database_geo.yml @@ -49,16 +48,16 @@ else # Assume it's mysql fi cp config/resque.yml.example config/resque.yml -sed -i 's|url:.*$|url: redis://redis:6379|g' config/resque.yml +sed -i 's/localhost/redis/g' config/resque.yml cp config/redis.cache.yml.example config/redis.cache.yml -sed -i 's|url:.*$|url: redis://redis:6379/10|g' config/redis.cache.yml +sed -i 's/localhost/redis/g' config/redis.cache.yml cp config/redis.queues.yml.example config/redis.queues.yml -sed -i 's|url:.*$|url: redis://redis:6379/11|g' config/redis.queues.yml +sed -i 's/localhost/redis/g' config/redis.queues.yml cp config/redis.shared_state.yml.example config/redis.shared_state.yml -sed -i 's|url:.*$|url: redis://redis:6379/12|g' config/redis.shared_state.yml +sed -i 's/localhost/redis/g' config/redis.shared_state.yml if [ "$SETUP_DB" != "false" ]; then setup_db |