diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /scripts/review_apps | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'scripts/review_apps')
-rw-r--r-- | scripts/review_apps/base-config.yaml | 20 | ||||
-rwxr-xr-x | scripts/review_apps/review-apps.sh | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index bfc35a6abde..cf55fca7452 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -16,11 +16,11 @@ gitlab: gitaly: resources: requests: - cpu: 1200m - memory: 245M + cpu: 2400m + memory: 1000M limits: - cpu: 1800m - memory: 367M + cpu: 3600m + memory: 1500M persistence: size: 10G gitlab-exporter: @@ -38,10 +38,10 @@ gitlab: resources: requests: cpu: 500m - memory: 25M + memory: 100M limits: cpu: 750m - memory: 37.5M + memory: 150M maxReplicas: 3 hpa: targetAverageValue: 500m @@ -52,10 +52,10 @@ gitlab: resources: requests: cpu: 855m - memory: 1285M + memory: 1927M limits: cpu: 1282m - memory: 1927M + memory: 2890M hpa: targetAverageValue: 650m task-runner: @@ -138,10 +138,10 @@ postgresql: resources: requests: cpu: 550m - memory: 250M + memory: 1000M limits: cpu: 825m - memory: 375M + memory: 1500M prometheus: install: false redis: diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 59e7d183ae7..88be78c7615 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -314,7 +314,7 @@ function deploy() { if [[ "$(base_config_changed)" == "true" ]]; then base_config_file_ref="${CI_COMMIT_SHA}"; fi local base_config_file="https://gitlab.com/gitlab-org/gitlab/raw/${base_config_file_ref}/scripts/review_apps/base-config.yaml" - echoinfo "Deploying ${release}..." true + echoinfo "Deploying ${release} to ${CI_ENVIRONMENT_URL} ..." true IMAGE_REPOSITORY="registry.gitlab.com/gitlab-org/build/cng-mirror" gitlab_migrations_image_repository="${IMAGE_REPOSITORY}/gitlab-rails-ee" |