Commit f7ec4df5 authored by Stan Hu's avatar Stan Hu

Merge branch '10403-harden-against-gitlab-assets-compile-transient-failures' into 'master'

Harden gitlab:assets:compile against transient network failures

Closes gitlab-ee#10403

See merge request gitlab-org/gitlab-ce!29211
parents 316fcc99 4e5f50d7
...@@ -33,9 +33,9 @@ gitlab:assets:compile: ...@@ -33,9 +33,9 @@ gitlab:assets:compile:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
script: script:
- node --version - node --version
- yarn install --frozen-lockfile --production --cache-folder .yarn-cache - retry yarn install --frozen-lockfile --production --cache-folder .yarn-cache
- free -m - free -m
- bundle exec rake gitlab:assets:compile - retry bundle exec rake gitlab:assets:compile
- time scripts/build_assets_image - time scripts/build_assets_image
- scripts/clean-old-cached-assets - scripts/clean-old-cached-assets
- rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here - rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here
...@@ -65,9 +65,9 @@ compile-assets: ...@@ -65,9 +65,9 @@ compile-assets:
stage: prepare stage: prepare
script: script:
- node --version - node --version
- yarn install --frozen-lockfile --cache-folder .yarn-cache - retry yarn install --frozen-lockfile --cache-folder .yarn-cache
- free -m - free -m
- bundle exec rake gitlab:assets:compile - retry bundle exec rake gitlab:assets:compile
- scripts/clean-old-cached-assets - scripts/clean-old-cached-assets
variables: variables:
# we override the max_old_space_size to prevent OOM errors # we override the max_old_space_size to prevent OOM errors
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment