Skip to content
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

Allow jira-config.properties file to become part of the dataset. #19

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow jira-config.properties file to become part of the dataset. #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...in/kotlin/com/atlassian/performance/tools/awsinfrastructure/jira/StandaloneNodeFormula.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ internal class StandaloneNodeFormula(
jiraIp = ssh.host.ipAddress
)
connection.execute("echo jira.home=`realpath $jiraHome` > $unpackedProduct/atlassian-jira/WEB-INF/classes/jira-application.properties")
connection.execute("echo jira.autoexport=false > $jiraHome/jira-config.properties")
connection.execute("touch $jiraHome/jira-config.properties")
connection.execute("grep -qxF \"jira.autoexport=false\" $jiraHome/jira-config.properties || echo -e \"\\njira.autoexport=false\" >> $jiraHome/jira-config.properties")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks error prone. What if we add jira.autoexport = false. It will still work, but will not be detected by grep.
It's still better than before, so I would not block the review 👍

We may also not need the property. I think it doesn't work like we expected (https://ecosystem.atlassian.net/browse/JPERF-344).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And AFAIK all our datasets already have the property set :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we could improve the grep, but I am going away till the end of Apr, so could do that in 2 weeks time. And yes, all our datasets have that already, my problem was that the jira-config.properties file was always overwritten, so I changed this to be less invasive. But if we can get rid of this altogether through the issue you linked, then I would be just as happy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Just add the issue key and changelog and we can merge. (Remember to rebase!)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this fixes JPERF-344, I wonder if the integration tests will become faster here. I hope we see it in the CI results.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this fixes JPERF-344, I wonder if the integration tests will become faster here. I hope we see it in the CI results.

It doesn't fix JPERF-344. AFAIK we see the export even if the flag is set.

downloadMysqlConnector(
"https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.40.tar.gz",
connection
Expand Down