Skip to content

Confluence update 7.4.11> 7.4.13 #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 15, 2021
Merged

Confluence update 7.4.11> 7.4.13 #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ea6026
Confluence/update 7.4.13
opopovss Nov 15, 2021
01d3513
fix
opopovss Nov 15, 2021
558acfd
Merge branch 'dev' into confluence-update-7.4.11-7.4.13
opopovss Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
* Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `4.13.13`, `4.20.1`

* Supported Confluence versions:
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.0`, `7.4.11`
* Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.0`, `7.4.13`

* Supported Bitbucket Server versions:
* Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.6.10`, `7.17.1`
Expand Down
2 changes: 1 addition & 1 deletion app/util/confluence/populate_db.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.11 7.13.0)
SUPPORTED_CONFLUENCE_VERSIONS=(7.4.13 7.13.0)

if [[ ! $(systemctl status confluence) ]]; then
echo "The Confluence service was not found on this host." \
Expand Down
2 changes: 1 addition & 1 deletion app/util/confluence/upload_attachments.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
################### Variables section ###################
# Confluence version variables
CONFLUENCE_VERSION_FILE="/media/atl/confluence/shared-home/confluence.version"
SUPPORTED_CONFLUENCE_VERSIONS=(7.4.11 7.13.0)
SUPPORTED_CONFLUENCE_VERSIONS=(7.4.13 7.13.0)
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 \
Expand Down
4 changes: 2 additions & 2 deletions docs/dc-apps-performance-toolkit-user-guide-confluence.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ All important parameters are listed and described in this section. For all other
| Parameter | Recommended value |
| --------- | ----------------- |
| Collaborative editing mode | synchrony-local |
| Confluence Version | The Data Center App Performance Toolkit officially supports `7.13.0` and `7.4.11` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) |
| Confluence Version | The Data Center App Performance Toolkit officially supports `7.13.0` and `7.4.13` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) |


**Cluster nodes**
Expand Down Expand Up @@ -380,7 +380,7 @@ All important parameters are listed and described in this section. For all other
| Parameter | Recommended value |
| --------- | ----------------- |
| Collaborative editing mode | synchrony-local |
| Confluence Version | The Data Center App Performance Toolkit officially supports `7.13.0` and `7.4.11` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) |
| Confluence Version | The Data Center App Performance Toolkit officially supports `7.13.0` and `7.4.13` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) |

**Cluster nodes**

Expand Down