Merge pull request atlassian#688 from atlassian/release/5.1.0

Release 5.1.0

Author: ometelytsia

CODEOWNERS

@@ -1,2 +1,2 @@
 # Default code owners - Atlassian Data Center App Performance Toolkit
-* @ometelytsia @SergeyMoroz0703 @astashys @mmizin
+* @ometelytsia @SergeyMoroz0703 @astashys @opopovss @OlehStefanyshyn

Dockerfile

@@ -8,9 +8,6 @@ FROM blazemeter/taurus
 
 ENV APT_INSTALL="apt-get -y install --no-install-recommends"
 
-# Remove bintray manually until PR https://github.com/Blazemeter/taurus/pull/1484/files is promoted to prod
-RUN sed -i '/dl.bintray.com/d' /etc/apt/sources.list
-
 RUN apt-get -y update \
   && $APT_INSTALL vim git openssh-server python3.8-dev python3-pip wget \
   && update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1 \

README.md

@@ -1,25 +1,24 @@
 # Data Center App Performance Toolkit 
 The Data Center App Performance Toolkit extends [Taurus](https://gettaurus.org/) which is an open source performance framework that executes JMeter and Selenium.
 
-This repository contains Taurus scripts for performance testing of Atlassian Data Center products: Jira, Jira Service Management, Confluence, and Bitbucket.
+This repository contains Taurus scripts for performance testing of Atlassian Data Center products: Jira, Jira Service Management, Confluence, Bitbucket and Crowd.
 
 ## Supported versions
 * Supported Jira versions: 
-    * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.13.7`, `8.5.15`
+    * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.13.10`, `8.5.18`
 
 * Supported Jira Service Management versions: 
-    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.13.7`, `4.5.15`
+    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.13.10`, `4.5.18`
 
 * Supported Confluence versions:
-    * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.4.9`  
-    * Confluence Platform release: `7.0.5`
+    * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.0`, `7.4.11` 
 
 * Supported Bitbucket Server versions:
-    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.6.7`, `6.10.11`  
+    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.6.9`, `6.10.13`  
     * Bitbucket Server Platform release: `7.0.5`
 
 * Supported Crowd versions:
-    * Crowd [Long Term Support release](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `4.3.0`
+    * Crowd [Long Term Support release](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `4.3.5`
 
 ## Support
 In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel.

app/bitbucket.yml

@@ -24,6 +24,7 @@ services:
   - module: shellexec
     prepare:
       - python util/pre_run/environment_checker.py
+      - python util/pre_run/check_for_updates.py
       - python util/pre_run/git_client_check.py
       - python util/data_preparation/bitbucket_prepare_data.py
     shutdown:
@@ -85,7 +86,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "91.0.4472.101" # Supports Chrome version 91. You can refer to http://chromedriver.chromium.org/downloads
+      version: "93.0.4577.63" # Supports Chrome version 93. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/confluence.yml

@@ -38,6 +38,7 @@ services:
   - module: shellexec
     prepare:
       - python util/pre_run/environment_checker.py
+      - python util/pre_run/check_for_updates.py
       - python util/data_preparation/confluence_prepare_data.py
     shutdown:
       - python util/post_run/jmeter_post_check.py
@@ -109,7 +110,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "91.0.4472.101" # Supports Chrome version 91. You can refer to http://chromedriver.chromium.org/downloads
+      version: "93.0.4577.63" # Supports Chrome version 93. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/crowd.yml

@@ -31,11 +31,12 @@ settings:
 
     JMETER_VERSION: 5.2.1
     LANGUAGE: en_US.utf8
-    allow_analytics: Yes              # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
+    allow_analytics: Yes            # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
 services:
   - module: shellexec
     prepare:
       - python util/pre_run/environment_checker.py
+      - python util/pre_run/check_for_updates.py
       - python util/data_preparation/crowd_prepare_data.py
       - python util/data_preparation/crowd_sync_check.py
     shutdown:

app/jira.yml

@@ -40,6 +40,7 @@ services:
   - module: shellexec
     prepare:
       - python util/pre_run/environment_checker.py
+      - python util/pre_run/check_for_updates.py
       - python util/data_preparation/jira_prepare_data.py
     shutdown:
       - python util/post_run/jmeter_post_check.py
@@ -113,7 +114,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "91.0.4472.101" # Supports Chrome version 91. You can refer to http://chromedriver.chromium.org/downloads
+      version: "93.0.4577.63" # Supports Chrome version 93. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jsm.yml

@@ -21,7 +21,7 @@ settings:
     WEBDRIVER_VISIBLE: False
     JMETER_VERSION: 5.2.1
     LANGUAGE: en_US.utf8
-    allow_analytics: Yes            # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
+    allow_analytics: Yes             # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
     # Action percentage for Jmeter and Locust load executors
     agent_browse_projects: 10
     agent_view_request: 24
@@ -150,7 +150,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "90.0.4430.24" # Supports Chrome version 90. You can refer to http://chromedriver.chromium.org/downloads
+      version: "91.0.4472.101" # Supports Chrome version 91. You can refer to http://chromedriver.chromium.org/downloads
 reporting:
   - data-source: sample-labels
     module: junit-xml

app/selenium_ui/bitbucket/pages/selectors.py

@@ -224,4 +224,4 @@ class UserSettingsLocator:
 
 
 class RepoCommitsLocator:
-    repo_commits_graph = (By.CSS_SELECTOR, 'svg.commit-graph')
+    repo_commits_graph = (By.ID, 'commits-table')

app/selenium_ui/jsm/pages/agent_pages.py

@@ -90,27 +90,38 @@ def __init__(self, driver, request_key=None):
     def wait_for_page_loaded(self):
         self.wait_until_visible(ViewCustomerRequestLocators.bread_crumbs)
 
+    def check_comment_text_is_displayed(self, text, rte_status=None):
+        if self.get_elements(ViewCustomerRequestLocators.comment_text_field_RTE) or \
+                self.get_elements(ViewCustomerRequestLocators.comment_text_field):
+            if rte_status:
+                self.wait_until_available_to_switch(ViewCustomerRequestLocators.comment_text_field_RTE)
+                if self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).text != text:
+                    self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(text)
+                    self.return_to_parent_frame()
+                    self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click()
+            elif self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).text != text:
+                self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(text)
+                self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click()
+
     def add_request_comment(self, rte_status):
         comment_text = f"Add comment from selenium - {self.generate_random_string(30)}"
         textarea = self.get_element(ViewCustomerRequestLocators.comment_collapsed_textarea)
         self.driver.execute_script("arguments[0].scrollIntoView(true);", textarea)
         textarea.click()
+        comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn)
+        self.driver.execute_script("arguments[0].scrollIntoView(true);", comment_button)
 
         if rte_status:
             self.wait_until_available_to_switch(ViewCustomerRequestLocators.comment_text_field_RTE)
-            tinymce_field = self.get_element(ViewCustomerRequestLocators.comment_tinymce_field)
-            self.driver.execute_script("arguments[0].scrollIntoView(true);", tinymce_field)
-            self.action_chains().send_keys_to_element(tinymce_field, comment_text).perform()
+            self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(comment_text)
             self.return_to_parent_frame()
+            comment_button.click()
+            self.check_comment_text_is_displayed(comment_text, True)
         else:
-            comment_text_field = self.get_element(ViewCustomerRequestLocators.comment_text_field)
-            self.driver.execute_script("arguments[0].scrollIntoView(true);", comment_text_field)
-            self.action_chains().move_to_element(comment_text_field).click()\
-                .send_keys_to_element(comment_text_field, comment_text).perform()
+            self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(comment_text)
+            comment_button.click()
+            self.check_comment_text_is_displayed(comment_text)
 
-        comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn)
-        self.driver.execute_script("arguments[0].scrollIntoView(true);", comment_button)
-        comment_button.click()
         self.wait_until_visible(ViewCustomerRequestLocators.comment_collapsed_textarea)
 
 
@@ -168,13 +179,15 @@ def __init__(self, driver, project_key=None, queue_id=None):
         self.page_url = url_manager.view_queue_all_open()
 
     def wait_for_page_loaded(self):
-        self.wait_until_visible(ViewQueueLocators.queues_status)
+        self.wait_until_any_ec_presented(
+            selector_names=[ViewQueueLocators.queues_status, ViewQueueLocators.queue_is_empty], timeout=self.timeout)
 
     def get_random_queue(self):
-        queues = self.get_elements(ViewQueueLocators.queues)
-        random_queue = random.choice([queue for queue in queues
-                                      if queue.text.partition('\n')[0] not in
-                                      ['All open', 'Recently resolved', 'Resolved past 7 days']
-                                      and queue.text.partition('\n')[2] != '0'])
-        random_queue.click()
-        self.wait_until_visible(ViewQueueLocators.queues_status, timeout=self.timeout)
+        if not self.get_elements(ViewQueueLocators.queue_is_empty):
+            queues = self.get_elements(ViewQueueLocators.queues)
+            random_queue = random.choice([queue for queue in queues
+                                          if queue.text.partition('\n')[0] not in
+                                          ['All open', 'Recently resolved', 'Resolved past 7 days']
+                                          and queue.text.partition('\n')[2] != '0'])
+            random_queue.click()
+            self.wait_until_present(ViewQueueLocators.queues_status, timeout=self.timeout)