diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 06:09:19 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 06:09:19 +0000 |
commit | ca2a7ed5bd43483f10fd74f46f31e32614889738 (patch) | |
tree | c16d2c56077a4453c6d975c231bf3d5a79114ea2 | |
parent | 597a43f359c3096d845e764b90439743962e5961 (diff) | |
download | gitlab-ce-ca2a7ed5bd43483f10fd74f46f31e32614889738.tar.gz |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | doc/administration/auth/ldap-ee.md | 2 | ||||
-rw-r--r-- | doc/administration/high_availability/redis.md | 2 | ||||
-rw-r--r-- | doc/administration/snippets/index.md | 2 | ||||
-rw-r--r-- | doc/administration/troubleshooting/debug.md | 4 | ||||
-rw-r--r-- | doc/development/contributing/issue_workflow.md | 2 | ||||
-rw-r--r-- | doc/development/testing_guide/end_to_end/index.md | 21 | ||||
-rw-r--r-- | doc/security/unlock_user.md | 2 | ||||
-rw-r--r-- | doc/update/restore_after_failure.md | 2 | ||||
-rw-r--r-- | doc/user/project/integrations/slack.md | 4 | ||||
-rw-r--r-- | qa/qa/page/group/menu.rb | 6 | ||||
-rwxr-xr-x | scripts/trigger-build | 8 |
11 files changed, 42 insertions, 13 deletions
diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index cbe24ca9e22..3220831ea87 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -470,7 +470,7 @@ step of the sync. sudo gitlab-rails console # For installations from source - sudo -u git -H bundle exec rails console production + sudo -u git -H bundle exec rails console -e production ``` 1. Set the log level to debug (only for this session): diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index 56c2bafea76..539d492632f 100644 --- a/doc/administration/high_availability/redis.md +++ b/doc/administration/high_availability/redis.md @@ -966,7 +966,7 @@ To make sure your configuration is correct: sudo gitlab-rails console # For source installations - sudo -u git rails console production + sudo -u git rails console -e production ``` 1. Run in the console: diff --git a/doc/administration/snippets/index.md b/doc/administration/snippets/index.md index 7632d685dc0..e6bbfa8cf00 100644 --- a/doc/administration/snippets/index.md +++ b/doc/administration/snippets/index.md @@ -40,7 +40,7 @@ The steps to configure this setting through the Rails console are: sudo gitlab-rails console # For installations from source - sudo -u git -H bundle exec rails console production + sudo -u git -H bundle exec rails console -e production ``` 1. Update the snippets maximum file size: diff --git a/doc/administration/troubleshooting/debug.md b/doc/administration/troubleshooting/debug.md index 01d143d045e..db8d186db43 100644 --- a/doc/administration/troubleshooting/debug.md +++ b/doc/administration/troubleshooting/debug.md @@ -11,13 +11,13 @@ an SMTP server, but you're not seeing mail delivered. Here's how to check the se 1. Run a Rails console: ```shell - sudo gitlab-rails console production + sudo gitlab-rails console -e production ``` or for source installs: ```shell - bundle exec rails console production + bundle exec rails console -e production ``` 1. Look at the ActionMailer `delivery_method` to make sure it matches what you diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index ec2386a2bd4..ab9c543f507 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -89,7 +89,7 @@ Following is a non-exhaustive list of facet labels: - ~enhancement: This label can refine an issue that has the ~feature label. - ~"master:broken": This label can refine an issue that has the ~bug label. -- ~"master:flaky": This label can refine an issue that has the ~bug label. +- ~"failure::flaky-test": This label can refine an issue that has the ~bug label. - ~"technical debt": This label can refine an issue that has the ~backstage label. - ~"static analysis": This label can refine an issue that has the ~backstage label. - ~"ci-build": This label can refine an issue that has the ~backstage label. diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md index b2ecffc593c..65ee2b0a759 100644 --- a/doc/development/testing_guide/end_to_end/index.md +++ b/doc/development/testing_guide/end_to_end/index.md @@ -88,6 +88,27 @@ subgraph "gitlab-qa pipeline" Please note, we plan to [add more specific information](https://gitlab.com/gitlab-org/quality/team-tasks/issues/156) about the tests included in each job/scenario that runs in `gitlab-qa`. +#### With Pipeline for Merged Results + +In a Pipeline for Merged Results, the pipeline runs on a new ref that contains the merge result of the source and target branch. +However, this ref is not available to the `gitlab-qa` pipeline. + +For this reason, the end-to-end tests on a Pipeline for Merged Results would use the head of the merge request source branch. + +```mermaid +graph LR + +A["a1b1c1 - branch HEAD (CI_MERGE_REQUEST_SOURCE_BRANCH_SHA)"] +B["x1y1z1 - master HEAD"] +C["d1e1f1 - merged results (CI_COMMIT_SHA)"] + +A --> C +B --> C + +A --> E["E2E tests"] +C --> D["Pipeline for merged results"] + ``` + ##### Running custom tests The [existing scenarios](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/what_tests_can_be_run.md) diff --git a/doc/security/unlock_user.md b/doc/security/unlock_user.md index fdf7ba90a3b..7c015525fdf 100644 --- a/doc/security/unlock_user.md +++ b/doc/security/unlock_user.md @@ -13,7 +13,7 @@ To unlock a locked user: ```shell ## For Omnibus GitLab - sudo gitlab-rails console production + sudo gitlab-rails console -e production ## For installations from source sudo -u git -H bundle exec rails console RAILS_ENV=production diff --git a/doc/update/restore_after_failure.md b/doc/update/restore_after_failure.md index 964a3c76c04..f254373e1c8 100644 --- a/doc/update/restore_after_failure.md +++ b/doc/update/restore_after_failure.md @@ -64,7 +64,7 @@ migrations are marked complete. ``` # Source install -sudo -u git -H bundle exec rails console production +sudo -u git -H bundle exec rails console -e production # Omnibus install sudo gitlab-rails console diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md index 9414dc8534c..c6a8941785a 100644 --- a/doc/user/project/integrations/slack.md +++ b/doc/user/project/integrations/slack.md @@ -52,10 +52,10 @@ the below rails console script. ```shell # start a rails console: -sudo gitlab-rails console production +sudo gitlab-rails console -e production # or for source installs: -bundle exec rails console production +bundle exec rails console -e production ``` ```ruby diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb index 230511ce6f6..02dd72d51fd 100644 --- a/qa/qa/page/group/menu.rb +++ b/qa/qa/page/group/menu.rb @@ -24,6 +24,12 @@ module QA end end + def click_settings + within_sidebar do + click_element(:group_settings_item) + end + end + def click_contribution_analytics_item hover_element(:analytics_link) do within_submenu(:analytics_sidebar_submenu) do diff --git a/scripts/trigger-build b/scripts/trigger-build index 889dcc01043..c14a3633075 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -84,13 +84,14 @@ module Trigger end def base_variables + # Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts due to pipeline for merged results { 'GITLAB_REF_SLUG' => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'], 'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'], 'TRIGGER_SOURCE' => ENV['CI_JOB_URL'], 'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'], 'TOP_UPSTREAM_SOURCE_JOB' => ENV['CI_JOB_URL'], - 'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_COMMIT_SHA'], + 'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'], 'TOP_UPSTREAM_SOURCE_REF' => ENV['CI_COMMIT_REF_NAME'], 'TOP_UPSTREAM_MERGE_REQUEST_PROJECT_ID' => ENV['CI_MERGE_REQUEST_PROJECT_ID'], 'TOP_UPSTREAM_MERGE_REQUEST_IID' => ENV['CI_MERGE_REQUEST_IID'] @@ -125,8 +126,9 @@ module Trigger end def extra_variables + # Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts due to pipeline for merged results { - 'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'], + 'GITLAB_VERSION' => ENV['CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'], 'ALTERNATIVE_SOURCES' => 'true', 'ee' => Trigger.ee? ? 'true' : 'false', 'QA_BRANCH' => ENV['QA_BRANCH'] || 'master' @@ -192,7 +194,7 @@ module Trigger Gitlab.create_commit_comment( ENV['CI_PROJECT_PATH'], - ENV['CI_COMMIT_SHA'], + ENV['CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'], "The [`#{ENV['CI_JOB_NAME']}`](#{ENV['CI_JOB_URL']}) job from pipeline #{ENV['CI_PIPELINE_URL']} triggered #{downstream_pipeline.web_url} downstream.") rescue Gitlab::Error::Error => error |