diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-10 21:08:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-10 21:08:26 +0300 |
commit | 8731954e18e2c5969d4a5f67d187892312c463c4 (patch) | |
tree | b8ce4b5012aa5239d3eb3f5168916e0597996742 /.gitlab | |
parent | 69e6424b738ea9ac3c6eed0263fe5a6951df7195 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/benchmark.gitlab-ci.yml | 17 | ||||
-rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 8 | ||||
-rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 27 |
3 files changed, 36 insertions, 16 deletions
diff --git a/.gitlab/ci/benchmark.gitlab-ci.yml b/.gitlab/ci/benchmark.gitlab-ci.yml new file mode 100644 index 00000000000..5949a9cd6a9 --- /dev/null +++ b/.gitlab/ci/benchmark.gitlab-ci.yml @@ -0,0 +1,17 @@ +benchmark-markdown: + extends: + - .single-db-ci-connection + - .rails-job-base + - .use-pg14 + - .benchmark:rules:benchmark-markdown + stage: benchmark + needs: + - setup-test-env + script: + - section_start "gitaly-test-spawn" "Spawning Gitaly"; scripts/gitaly-test-spawn; section_end "gitaly-test-spawn"; # Do not use 'bundle exec' here + - bundle exec rake benchmark:banzai &> benchmark-markdown.txt + artifacts: + when: always + paths: + - benchmark-markdown.txt + allow_failure: true diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 7e0a9c3a21b..cb35d5ff56d 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -431,7 +431,7 @@ .use-pg14-opensearch1-ee: services: - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-14-pgvector-0.4.1 - command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] + command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off", "-c", "max_locks_per_transaction=128"] alias: postgres - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12 alias: rediscluster # configure connections in config/redis.yml @@ -450,7 +450,7 @@ .use-pg14-opensearch2-ee: services: - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-14-pgvector-0.4.1 - command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] + command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off", "-c", "max_locks_per_transaction=128"] alias: postgres - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12 alias: rediscluster # configure connections in config/redis.yml @@ -469,7 +469,7 @@ .use-pg15-opensearch1-ee: services: - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1 - command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] + command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off", "-c", "max_locks_per_transaction=128"] alias: postgres - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12 alias: rediscluster # configure connections in config/redis.yml @@ -488,7 +488,7 @@ .use-pg15-opensearch2-ee: services: - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1 - command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] + command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off", "-c", "max_locks_per_transaction=128"] alias: postgres - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12 alias: rediscluster # configure connections in config/redis.yml diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 6c190281655..1003989a67a 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -465,7 +465,7 @@ - ".stylelintrc" - "Dockerfile.assets" - "vendor/assets/**/*" - - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}" + - ".{eslintrc.yml,eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}" - "*_VERSION" - "{,jh/}Gemfile{,.lock}" - "Rakefile" @@ -492,7 +492,7 @@ - ".stylelintrc" - "Dockerfile.assets" - "vendor/assets/**/*" - - ".{eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}" + - ".{eslintrc.yml,eslintignore,gitattributes,nvmrc,prettierrc,stylelintrc,yamllint}" - ".gitlab-ci.yml" - "*_VERSION" - "{,jh/}Gemfile{,.lock}" @@ -1152,17 +1152,9 @@ changes: *workhorse-patterns # Rules to support .qa:rules:package-and-test - <<: *if-default-branch-schedule-nightly - - <<: *if-merge-request - changes: *dependency-patterns - <<: *if-merge-request-labels-run-all-e2e - <<: *if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e changes: *feature-flag-development-config-patterns - - <<: *if-merge-request - changes: *feature-flag-development-config-patterns - - <<: *if-merge-request - changes: *nodejs-patterns - - <<: *if-merge-request - changes: *ci-qa-patterns - <<: *if-force-ci .frontend:rules:compile-production-assets-as-if-foss: @@ -2473,9 +2465,9 @@ - ".gitlab/ci/test-metadata.gitlab-ci.yml" - "scripts/rspec_helpers.sh" -####################### +################### # Preflight rules # -####################### +################### .preflight:rules:rails-production-server-boot: rules: @@ -2605,3 +2597,14 @@ - <<: *if-merge-request-labels-pipeline-expedite when: never - !reference [".releases:rules:canonical-dot-com-gitlab-stable-branch-only-setup-test-env-patterns", rules] + +################### +# Benchmark rules # +################### +.benchmark:rules:benchmark-markdown: + rules: + - <<: *if-default-refs + changes: *setup-test-env-patterns + when: manual + - <<: *if-merge-request-labels-run-all-rspec + when: manual |