Merge pull request #1160 from atlassian/release/7.6.0

Release 7.6.0

Dockerfile

@@ -8,14 +8,19 @@ FROM python:3.11-slim-bullseye
 
 ENV APT_INSTALL="apt-get -y install --no-install-recommends"
 
+ARG CHROME_VERSION="latest"
+
+ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
+ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb"
+
 RUN apt-get -y update \
   && $APT_INSTALL vim git openssh-server wget openjdk-11-jdk \
   && python -m pip install --upgrade pip \
   && apt-get clean
 
-RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
-  && $APT_INSTALL ./google-chrome-stable_current_amd64.deb \
-  && rm -rf ./google-chrome-stable_current_amd64.deb
+RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_LATEST_URL; else wget -O google-chrome.deb $CHROME_VERSION_URL; fi \
+  && $APT_INSTALL ./google-chrome.deb \
+  && rm -rf ./google-chrome.deb
 
 COPY requirements.txt /tmp/requirements.txt
 RUN pip install --no-cache-dir -r /tmp/requirements.txt

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.4.8` and `8.20.24`
+    * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.4.10` and `8.20.26`
 
 * Supported Jira Service Management versions: 
-    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.4.8` and `4.20.24`
+    * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.4.10` and `4.20.26`
 
 * Supported Confluence versions:
-    * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.11`, `7.13.18`  and `8.1.4` platform release
+    * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.14` and `8.5.1`
 
 * Supported Bitbucket Server versions:
-    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.14` and `8.9.2`
+    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.16` and `8.9.5`
 
 * Supported Crowd versions:
     * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `5.1.4`
 
 * Supported Bamboo versions:
-    * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.3`
+    * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.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/bamboo.yml

@@ -49,7 +49,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.10.0
+      - selenium==4.13.0
 execution:
   - scenario: jmeter
     executor: jmeter
@@ -123,7 +123,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
+      version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/bitbucket.yml

@@ -36,7 +36,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.10.0
+      - selenium==4.13.0
 execution:
   - scenario: ${load_executor}
     concurrency: ${concurrency}
@@ -90,7 +90,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
+      version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/confluence.yml

@@ -51,7 +51,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.10.0
+      - selenium==4.13.0
 execution:
   - scenario: ${load_executor}
     executor: ${load_executor}
@@ -117,7 +117,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
+      version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jira.yml

@@ -51,7 +51,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.10.0
+      - selenium==4.13.0
 execution:
   - scenario: ${load_executor}
     executor: ${load_executor}
@@ -118,7 +118,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
+      version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
 - data-source: sample-labels
   module: junit-xml

app/jsm.yml

@@ -67,7 +67,7 @@ services:
       - python util/post_run/cleanup_results_dir.py
   - module: pip-install
     packages:
-      - selenium==4.10.0
+      - selenium==4.13.0
 execution:
   - scenario: ${load_executor}_agents
     executor: ${load_executor}
@@ -170,7 +170,7 @@ modules:
       httpsampler.ignore_failed_embedded_resources: "true"
   selenium:
     chromedriver:
-      version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads
+      version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing
 reporting:
   - data-source: sample-labels
     module: junit-xml

app/selenium_ui/jsm/pages/agent_pages.py

@@ -11,7 +11,7 @@ class PopupManager(BasePage):
     def dismiss_default_popup(self):
         return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2,
                                   PopupLocators.popup_3, PopupLocators.popup_4,
-                                  PopupLocators.popup_5, PopupLocators.popup_6)
+                                  PopupLocators.popup_5, PopupLocators.popup_6, PopupLocators.popup_7)
 
 
 class Login(BasePage):

app/selenium_ui/jsm/pages/agent_selectors.py

@@ -10,6 +10,7 @@ class PopupLocators:
     popup_4 = '.aui-button aui-button-link'
     popup_5 = '.buttons-container > div > a'
     popup_6 = '.css-19r5em7'
+    popup_7 = '.css-178ag6o'
 
 
 class UrlManager:

app/util/bamboo/bamboo_dataset_generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.atlassian.bamboo</groupId>
         <artifactId>bamboo-specs-parent</artifactId>
-        <version>9.2.1</version>
+        <version>9.2.5</version>
         <relativePath/>
     </parent>
 
@@ -18,7 +18,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -49,13 +49,13 @@
         <dependency>
             <groupId>com.atlassian.buildeng</groupId>
             <artifactId>bamboo-plan-ownership-specs</artifactId>
-            <version>1.4.0</version>
+            <version>2.1.7</version>
         </dependency>
         <!-- For PBC -->
         <dependency>
             <groupId>com.atlassian.buildeng</groupId>
             <artifactId>bamboo-pbc-specs</artifactId>
-            <version>1.4.0</version>
+            <version>2.1.7</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
@@ -67,38 +67,38 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.12.4</version>
+            <version>2.15.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.4.2</version>
+            <version>2.15.2</version>
         </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>2.4.0</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
+            <version>1.16.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.17.1</version>
+            <version>2.20.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
+            <version>2.20.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.17.1</version>
+            <version>2.20.0</version>
         </dependency>
     </dependencies>
 
@@ -115,4 +115,4 @@
             <url>https://packages.atlassian.com/mvn/maven-external/</url>
         </pluginRepository>
     </pluginRepositories>
-</project>
+</project>

app/util/conf.py

@@ -2,7 +2,7 @@
 
 from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML
 
-TOOLKIT_VERSION = '7.5.0'
+TOOLKIT_VERSION = '7.6.0'
 UNSUPPORTED_VERSION = '6.3.0'
 
 

app/util/confluence/populate_db.sh

@@ -20,7 +20,7 @@ CONFLUENCE_DB_PASS="Password1!"
 SELECT_CONFLUENCE_SETTING_SQL="select BANDANAVALUE from BANDANA where BANDANACONTEXT = '_GLOBAL' and BANDANAKEY = 'atlassian.confluence.settings';"
 
 # Confluence version variables
-SUPPORTED_CONFLUENCE_VERSIONS=(7.13.7 7.19.2)
+SUPPORTED_CONFLUENCE_VERSIONS=(7.19.2)
 
 if [[ ! $(systemctl status confluence) ]]; then
   echo "The Confluence service was not found on this host." \

app/util/confluence/upload_attachments.sh

@@ -4,7 +4,7 @@
 ###################    Variables section         ###################
 # Confluence version variables
 CONFLUENCE_VERSION_FILE="/media/atl/confluence/shared-home/confluence.version"
-SUPPORTED_CONFLUENCE_VERSIONS=(7.13.7 7.19.2)
+SUPPORTED_CONFLUENCE_VERSIONS=(7.19.2)
 CONFLUENCE_VERSION=$(sudo su confluence -c "cat ${CONFLUENCE_VERSION_FILE}")
 if [[ -z "$CONFLUENCE_VERSION" ]]; then
         echo The $CONFLUENCE_VERSION_FILE file does not exists or emtpy. Please check if CONFLUENCE_VERSION_FILE variable \

app/util/jira/populate_db.sh

@@ -43,8 +43,8 @@ JIRA_DB_PASS="Password1!"
 
 # Jira/JSM supported versions
 
-SUPPORTED_JIRA_VERSIONS=(8.20.24 9.4.8)
-SUPPORTED_JSM_VERSIONS=(4.20.24 5.4.8)
+SUPPORTED_JIRA_VERSIONS=(8.20.26 9.4.10)
+SUPPORTED_JSM_VERSIONS=(4.20.26 5.4.10)
 
 SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}")
 # JSM section

app/util/jira/upload_attachments.sh

@@ -29,8 +29,8 @@ JIRA_VERSION_FILE="/media/atl/jira/shared/jira-software.version"
 
 # Jira/JSM supported versions
 
-SUPPORTED_JIRA_VERSIONS=(8.20.24 9.4.8)
-SUPPORTED_JSM_VERSIONS=(4.20.24 5.4.8)
+SUPPORTED_JIRA_VERSIONS=(8.20.26 9.4.10)
+SUPPORTED_JSM_VERSIONS=(4.20.26 5.4.10)
 
 SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}")
 if [[ ${jsm} == 1 ]]; then