Skip to content

Commit

Permalink
Merge pull request #1682 from atlassian/release/8.6.0
Browse files Browse the repository at this point in the history
Release 8.6.0
  • Loading branch information
ometelytsia authored Feb 5, 2025
2 parents ce4ccf2 + 80a8fdb commit 99f72f1
Show file tree
Hide file tree
Showing 46 changed files with 1,425 additions and 732 deletions.
11 changes: 7 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
# bzt run: docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt jira.yml
# interactive run: docker run -it --entrypoint="/bin/bash" -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt

FROM python:3.12-slim-bookworm
FROM python:3.13-slim-bookworm

ENV APT_INSTALL="apt-get -y install --no-install-recommends"

ARG CHROME_VERSION="latest"
ARG INCLUDE_BZT_TOOLS="false"

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"
Expand All @@ -29,9 +30,11 @@ RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_
COPY requirements.txt /tmp/requirements.txt
RUN pip install --no-cache-dir -r /tmp/requirements.txt

RUN wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \
tar -xzf /tmp/bzt.tar.gz -C /root && \
rm /tmp/bzt.tar.gz
RUN if [ "$INCLUDE_BZT" = "true" ]; then \
wget https://blazemeter-tools.s3.us-east-2.amazonaws.com/bzt.tar.gz -O /tmp/bzt.tar.gz && \
tar -xzf /tmp/bzt.tar.gz -C /root && \
rm /tmp/bzt.tar.gz; \
fi

WORKDIR /dc-app-performance-toolkit/app

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ 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.12`, `9.4.25` and `10.0.1` Platform release
* Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.12.17` and `10.3.0`

* Supported Jira Service Management versions:
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.12`, `5.4.25` and `10.0.1` Platform release
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.12.17` and `10.3.1`

* Supported Confluence versions:
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.14`, `7.19.26` and `9.0.2` Platform release
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.5.18` and `9.2.0`

* Supported Bitbucket Server versions:
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.7`, `8.9.18` and `9.0.0` Platform release
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `8.19.14` and `9.4.1`

* Supported Crowd versions:
* Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `6.0.0`

* Supported Bamboo versions:
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.6.6` and `10.0.1` Platform release
* Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `10.2.0`

## 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.

## Installation and set up

#### Dependencies
* Python 3.9 - 3.12 and pip
* Python 3.9 - 3.13 and pip
* JDK 17 or JDK 21
* Google Chrome web browser
* Git client (only for Bitbucket DC)
Expand Down
4 changes: 2 additions & 2 deletions app/bamboo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==4.25.0
- selenium==4.27.1
execution:
- scenario: jmeter
executor: jmeter
Expand Down Expand Up @@ -121,7 +121,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing
reporting:
- data-source: sample-labels
module: junit-xml
4 changes: 2 additions & 2 deletions app/bitbucket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==4.25.0
- selenium==4.27.1
execution:
- scenario: ${load_executor}
concurrency: ${concurrency}
Expand Down Expand Up @@ -87,7 +87,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing
reporting:
- data-source: sample-labels
module: junit-xml
4 changes: 2 additions & 2 deletions app/confluence.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==4.25.0
- selenium==4.27.1
execution:
- scenario: ${load_executor}
executor: ${load_executor}
Expand Down Expand Up @@ -114,7 +114,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing
reporting:
- data-source: sample-labels
module: junit-xml
Expand Down
7 changes: 6 additions & 1 deletion app/extension/jira/extension_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from selenium_ui.base_page import BasePage
from selenium_ui.conftest import print_timing
from selenium_ui.jira.pages.pages import Login
from selenium_ui.jira.pages.pages import Login, AdminPage
from util.conf import JIRA_SETTINGS


Expand All @@ -23,12 +23,17 @@ def app_specific_action(webdriver, datasets):
# login_page = Login(webdriver)
# login_page.delete_all_cookies()
# login_page.go_to()
# login_page.wait_for_login_page_loaded()
# login_page.set_credentials(username=username, password=password)
# login_page.wait_for_dashboard_or_first_login_loaded()
# if login_page.is_first_login():
# login_page.first_login_setup()
# if login_page.is_first_login_second_page():
# login_page.first_login_second_page_setup()
# login_page.wait_for_page_loaded()
# # uncomment below line to do web_sudo and authorise access to admin pages
# # AdminPage(webdriver).go_to(password=password)
#
# app_specific_user_login(username='admin', password='admin')
# measure()

Expand Down
4 changes: 2 additions & 2 deletions app/jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:
- python util/post_run/cleanup_results_dir.py
- module: pip-install
packages:
- selenium==4.25.0
- selenium==4.27.1
execution:
- scenario: ${load_executor}
executor: ${load_executor}
Expand Down Expand Up @@ -115,7 +115,7 @@ modules:
httpsampler.ignore_failed_embedded_resources: "true"
selenium:
chromedriver:
version: "130.0.6723.91" # Supports Chrome version 130. You can refer to https://googlechromelabs.github.io/chrome-for-testing
version: "133.0.6943.53" # Supports Chrome version 133. You can refer to https://googlechromelabs.github.io/chrome-for-testing
reporting:
- data-source: sample-labels
module: junit-xml
Loading

0 comments on commit 99f72f1

Please sign in to comment.