Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 10 deletions

diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index 810912c7ccf..5de9629baa1 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -282,11 +282,11 @@ module QA
       end
 
       def jira_admin_username
-        ENV['JIRA_ADMIN_USERNAME']
+        ENV['QA_JIRA_ADMIN_USERNAME']
       end
 
       def jira_admin_password
-        ENV['JIRA_ADMIN_PASSWORD']
+        ENV['QA_JIRA_ADMIN_PASSWORD']
       end
 
       def jira_hostname
diff --git a/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
index 7e46276be92..9132b262b51 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/integrations/jira/jira_issue_import_spec.rb
@@ -18,14 +18,12 @@ module QA
         set_up_jira_integration
         import_jira_issues
 
-        QA::Support::Retrier.retry_on_exception do
-          Page::Project::Menu.perform(&:click_issues)
-
-          Page::Project::Issue::Index.perform do |issues_page|
-            expect(issues_page).to have_content("2 issues successfully imported")
-
-            issues_page.click_issue_link(jira_issue_title)
-          end
+        Page::Project::Menu.perform(&:click_issues)
+        Page::Project::Issue::Index.perform do |issues_page|
+          expect { issues_page }.to eventually_have_content(jira_issue_title).within(
+            max_attempts: 5, sleep_interval: 1, reload_page: issues_page
+          )
+          issues_page.click_issue_link(jira_issue_title)
         end
 
         expect(page).to have_content(jira_issue_description)