Commit cc502768 authored by John Jarvis's avatar John Jarvis

Merge commit '207d3100' into 11-9-stable-prepare-rc4

parents 3190b498 207d3100

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -444,6 +444,17 @@ setup-test-env: ...@@ -444,6 +444,17 @@ setup-test-env:
- master - master
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].*|.*-docs$)/
.review-schedules-only: &review-schedules-only
only:
refs:
- schedules@gitlab-org/gitlab-ce
- schedules@gitlab-org/gitlab-ee
kubernetes: active
except:
refs:
- tags
- /(^docs[\/-].*|.*-docs$)/
.review-base: &review-base .review-base: &review-base
<<: *dedicated-no-docs-no-db-pull-cache-job <<: *dedicated-no-docs-no-db-pull-cache-job
<<: *review-only <<: *review-only
...@@ -672,6 +683,35 @@ gitlab:assets:compile: ...@@ -672,6 +683,35 @@ gitlab:assets:compile:
- docker - docker
- gitlab-org - gitlab-org
gitlab:ui:visual:
<<: *except-docs
tags:
- gitlab-org
before_script: []
dependencies:
- compile-assets
script:
# Remove node modules from GitLab that may conflict with gitlab-ui
- rm -r node_modules
- git clone https://gitlab.com/gitlab-org/gitlab-ui.git
- cp public/assets/application-*.css gitlab-ui/styles/application.css
- cd gitlab-ui
- yarn install
- CSS_URL=./application.css yarn test
only:
changes:
- app/assets/stylesheets/*.scss
- app/assets/stylesheets/**/*.scss
- app/assets/stylesheets/**/**/*.scss
except:
refs:
- master
variables:
- $CI_COMMIT_MESSAGE =~ /\[skip visual\]/i
artifacts:
paths:
- tests/__image_snapshots__/
karma: karma:
<<: *dedicated-no-docs-pull-cache-job <<: *dedicated-no-docs-pull-cache-job
<<: *use-pg <<: *use-pg
...@@ -959,8 +999,7 @@ no_ee_check: ...@@ -959,8 +999,7 @@ no_ee_check:
- //@gitlab-org/gitlab-ce - //@gitlab-org/gitlab-ce
# GitLab Review apps # GitLab Review apps
review-build-cng: .review-build-cng-base: &review-build-cng-base
<<: *review-only
image: ruby:2.5-alpine image: ruby:2.5-alpine
stage: test stage: test
before_script: [] before_script: []
...@@ -976,7 +1015,15 @@ review-build-cng: ...@@ -976,7 +1015,15 @@ review-build-cng:
- wait_for_job_to_be_done "gitlab:assets:compile" - wait_for_job_to_be_done "gitlab:assets:compile"
- BUILD_TRIGGER_TOKEN=$REVIEW_APPS_BUILD_TRIGGER_TOKEN ./scripts/trigger-build cng - BUILD_TRIGGER_TOKEN=$REVIEW_APPS_BUILD_TRIGGER_TOKEN ./scripts/trigger-build cng
review-deploy: review-build-cng:
<<: *review-only
<<: *review-build-cng-base
schedule:review-build-cng:
<<: *review-schedules-only
<<: *review-build-cng-base
.review-deploy-base: &review-deploy-base
<<: *review-base <<: *review-base
retry: 2 retry: 2
allow_failure: true allow_failure: true
...@@ -998,6 +1045,8 @@ review-deploy: ...@@ -998,6 +1045,8 @@ review-deploy:
- source ./scripts/review_apps/review-apps.sh - source ./scripts/review_apps/review-apps.sh
script: script:
- wait_for_job_to_be_done "review-build-cng" - wait_for_job_to_be_done "review-build-cng"
after_script:
- source ./scripts/review_apps/review-apps.sh
- check_kube_domain - check_kube_domain
- download_gitlab_chart - download_gitlab_chart
- ensure_namespace - ensure_namespace
...@@ -1006,6 +1055,15 @@ review-deploy: ...@@ -1006,6 +1055,15 @@ review-deploy:
- time deploy - time deploy
- add_license - add_license
review-deploy:
<<: *review-deploy-base
schedule:review-deploy:
<<: *review-deploy-base
<<: *review-schedules-only
script:
- wait_for_job_to_be_done "schedule:review-build-cng"
.review-qa-base: &review-qa-base .review-qa-base: &review-qa-base
<<: *review-docker <<: *review-docker
allow_failure: true allow_failure: true
...@@ -1032,22 +1090,26 @@ review-deploy: ...@@ -1032,22 +1090,26 @@ review-deploy:
- apk update && apk add curl jq - apk update && apk add curl jq
- source ./scripts/review_apps/review-apps.sh - source ./scripts/review_apps/review-apps.sh
- gem install gitlab-qa --no-document ${GITLAB_QA_VERSION:+ --version ${GITLAB_QA_VERSION}} - gem install gitlab-qa --no-document ${GITLAB_QA_VERSION:+ --version ${GITLAB_QA_VERSION}}
- wait_for_job_to_be_done "review-deploy"
review-qa-smoke: review-qa-smoke:
<<: *review-qa-base <<: *review-qa-base
script: script:
- wait_for_job_to_be_done "review-deploy"
- gitlab-qa Test::Instance::Smoke "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" - gitlab-qa Test::Instance::Smoke "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}"
review-qa-all: review-qa-all:
<<: *review-qa-base <<: *review-qa-base
script: script:
- wait_for_job_to_be_done "review-deploy"
- gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}"
when: manual when: manual
review-performance:
.review-performance-base: &review-performance-base
<<: *review-qa-base <<: *review-qa-base
script: script:
- wait_for_job_to_be_done "review-deploy"
after_script:
- mkdir gitlab-exporter - mkdir gitlab-exporter
- wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js - wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
- mkdir sitespeed-results - mkdir sitespeed-results
...@@ -1059,6 +1121,9 @@ review-performance: ...@@ -1059,6 +1121,9 @@ review-performance:
reports: reports:
performance: performance.json performance: performance.json
review-performance:
<<: *review-performance-base
review-stop: review-stop:
<<: *review-base <<: *review-base
<<: *single-script-job <<: *single-script-job
...@@ -1078,21 +1143,20 @@ review-stop: ...@@ -1078,21 +1143,20 @@ review-stop:
schedule:review-cleanup: schedule:review-cleanup:
<<: *review-base <<: *review-base
<<: *review-schedules-only
stage: build stage: build
allow_failure: true allow_failure: true
variables: variables:
GIT_DEPTH: "1" GIT_DEPTH: "1"
environment: environment:
name: review/auto-cleanup name: review/auto-cleanup
only:
refs:
- schedules@gitlab-org/gitlab-ce
- schedules@gitlab-org/gitlab-ee
kubernetes: active
except:
- tags
- /(^docs[\/-].*|.*-docs$)/
before_script: before_script:
- gem install gitlab --no-document - gem install gitlab --no-document
script: script:
- ruby -rrubygems scripts/review_apps/automated_cleanup.rb - ruby -rrubygems scripts/review_apps/automated_cleanup.rb
schedule:review-performance:
<<: *review-performance-base
<<: *review-schedules-only
script:
- wait_for_job_to_be_done "schedule:review-deploy"
...@@ -181,3 +181,6 @@ Cop/InjectEnterpriseEditionModule: ...@@ -181,3 +181,6 @@ Cop/InjectEnterpriseEditionModule:
Exclude: Exclude:
- 'spec/**/*' - 'spec/**/*'
- 'ee/spec/**/*' - 'ee/spec/**/*'
Style/ReturnNil:
Enabled: true
1.23.0 1.26.0
\ No newline at end of file
...@@ -267,7 +267,6 @@ gem 'gemojione', '~> 3.3' ...@@ -267,7 +267,6 @@ gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2' gem 'gon', '~> 6.2'
gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'request_store', '~> 1.3' gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1' gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
...@@ -421,7 +420,7 @@ group :ed25519 do ...@@ -421,7 +420,7 @@ group :ed25519 do
end end
# Gitaly GRPC client # Gitaly GRPC client
gem 'gitaly-proto', '~> 1.12.0', require: 'gitaly' gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
gem 'grpc', '~> 1.15.0' gem 'grpc', '~> 1.15.0'
......
...@@ -279,7 +279,7 @@ GEM ...@@ -279,7 +279,7 @@ GEM
gettext_i18n_rails (>= 0.7.1) gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0) po_to_json (>= 1.0.0)
rails (>= 3.2.0) rails (>= 3.2.0)
gitaly-proto (1.12.0) gitaly-proto (1.13.0)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0)