Merge pull request #1930 from atlassian/release/8.9.0

Release/8.9.0

Author: bgospodarek

CODEOWNERS

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

README.md

@@ -5,22 +5,22 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
 
 ## Supported versions
 * Supported Jira versions: 
-    * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.26`, `10.3.9` and `11.0.0` Platform release
+    * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.28`, `10.3.12` and `11.0.1` Platform release
 
 * Supported Jira Service Management versions: 
-    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.26`, `10.3.9` and `11.0.0` Platform release
+    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.28`, `10.3.12` and `11.0.1` Platform release
 
 * Supported Confluence versions:
-    * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.25`, `9.2.7` and `10.0.2` Platform release
+    * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.27`, `9.2.9` and `10.0.3` Platform release
 
 * Supported Bitbucket Server versions:
-    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.21` and `9.4.9`
+    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.24`, `9.4.12` and `10.0.1` Platform release
 
 * Supported Crowd versions:
-    * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.3.2`
+    * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `7.1.0`
 
 * Supported Bamboo versions:
-    * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.7`
+    * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.9`
 
 ## Support
 In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](https://go.atlassian.com/dcapt-community-slack) **#data-center-app-performance-toolkit** channel.

app/bamboo.yml

@@ -53,7 +53,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.35.0
+      - selenium==4.38.0
 execution:
   - scenario: jmeter
     executor: jmeter
@@ -123,7 +123,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/bitbucket.yml

@@ -39,7 +39,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.35.0
+      - selenium==4.38.0
 execution:
   - scenario: ${load_executor}
     concurrency: ${concurrency}
@@ -89,7 +89,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/confluence.yml

@@ -54,7 +54,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.35.0
+      - selenium==4.38.0
 execution:
   - scenario: ${load_executor}
     executor: ${load_executor}
@@ -116,7 +116,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jira.yml

@@ -54,7 +54,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.35.0
+      - selenium==4.38.0
 execution:
   - scenario: ${load_executor}
     executor: ${load_executor}
@@ -117,7 +117,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jsm.yml

@@ -69,7 +69,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.35.0
+      - selenium==4.38.0
 execution:
   - scenario: ${load_executor}_agents
     executor: ${load_executor}
@@ -168,7 +168,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "140.0.7339.82" # Supports Chrome version 140. You can refer to https://googlechromelabs.github.io/chrome-for-testing
+      version: "142.0.7444.61" # Supports Chrome version 142. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
   - data-source: sample-labels
     module: junit-xml

app/reports_generation/scripts/results_archivator.py

@@ -1,14 +1,34 @@
 from pathlib import Path
 from shutil import make_archive
+import re
 
 from scripts.utils import validate_config, clean_str, resolve_relative_path
 
 
 def __zip_folder(folder_path: Path, destination_path: Path) -> Path:
+    yml_files = list(folder_path.glob("*.yml"))
+    if len(yml_files) > 0:
+        __hide_sensitive_info(yml_files)
     archive_path = make_archive(destination_path, 'zip', folder_path)
     return Path(archive_path)
 
 
+def __hide_sensitive_info(files: list[Path]) -> None:
+    for file in files:
+        with file.open('r') as f:
+            lines = f.readlines()
+        new_lines = []
+        file_edited = False
+        for line in lines:
+            if re.match(r'\s*admin_password\s*:', line):
+                line = re.sub(r'(:\s*).+', r'\1****', line)
+                file_edited = True
+            new_lines.append(line)
+        if file_edited:
+            with file.open('w') as f:
+                f.writelines(new_lines)
+
+
 def archive_results(config: dict, results_dir: Path):
     validate_config(config)
     for run in config['runs']:

app/selenium_ui/base_page.py

@@ -4,7 +4,7 @@
 import time
 
 from packaging import version
-from selenium.common.exceptions import WebDriverException
+from selenium.common.exceptions import WebDriverException, TimeoutException
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as ec
@@ -79,6 +79,14 @@ def wait_until_visible(self, selector, timeout=timeout):
         return self.__wait_until(expected_condition=ec.visibility_of_element_located(selector), locator=selector,
                                  time_out=timeout)
 
+    def became_visible_in_time(self, selector, timeout):
+        try:
+            self.__wait_until(expected_condition=ec.visibility_of_element_located(selector), locator=selector,
+                                 time_out=timeout)
+            return True
+        except TimeoutException:
+            return False
+
     def wait_until_available_to_switch(self, selector):
         return self.__wait_until(expected_condition=ec.frame_to_be_available_and_switch_to_it(selector),
                                  locator=selector,

app/selenium_ui/bitbucket/modules.py

@@ -186,6 +186,7 @@ def measure():
         PopupManager(webdriver).dismiss_default_popup()
         pull_request_page.dismiss_updates_info_popup()
         pull_request_page.click_inline_comment_button_js()
+        PopupManager(webdriver).dismiss_default_popup()
         pull_request_page.dismiss_updates_info_popup()
         pull_request_page.add_code_comment()
     measure()
@@ -239,12 +240,15 @@ def sub_measure():
             branch_from = datasets['current_session']['pull_request_branch_from']
             branch_to = datasets['current_session']['pull_request_branch_to']
             repository_branches_page.open_base_branch(base_branch_name=branch_from)
+            PopupManager(webdriver).dismiss_default_popup()
             fork_branch_from = repository_branches_page.create_branch_fork_rnd_name(base_branch_name=branch_from)
             navigation_panel.wait_for_navigation_panel()
+            PopupManager(webdriver).dismiss_default_popup()
             repository_branches_page.open_base_branch(base_branch_name=branch_to)
             fork_branch_to = repository_branches_page.create_branch_fork_rnd_name(base_branch_name=branch_to)
             datasets['pull_request_fork_branch_to'] = fork_branch_to
             navigation_panel.wait_for_navigation_panel()
+            PopupManager(webdriver).dismiss_default_popup()
             repo_pull_requests_page.create_new_pull_request(from_branch=fork_branch_from, to_branch=fork_branch_to)
             pull_request_page.dismiss_updates_info_popup()
             PopupManager(webdriver).dismiss_default_popup()