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.

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

jmeter: 3.3 -> 4.0 #35655

Merged
merged 2 commits into from Feb 28, 2018
Merged

jmeter: 3.3 -> 4.0 #35655

merged 2 commits into from Feb 28, 2018

Conversation

markus1189
Copy link
Contributor

[x] Tested execution of binary file

@markus1189
Copy link
Contributor Author

I think you're right @volth, I am currently investigating it seems like there is nothing to substitute anyway because the script does already in 3.3 no longer have this line.

@markus1189
Copy link
Contributor Author

@volth Okay I refactored the package a bit, could you make another review pass?

Things done:

  1. extracted version attribute
  2. added test in checkPhase whether jmeter runs (I had to reorder the phases, true?)
  3. prefixed some of the bin/ scripts with the jmeter- prefix
  4. wrapped the jmeter program because 4.0 checks JAVA_HOME anyway

buildInputs = [ jre ];
buildInputs = [ jre makeWrapper ];

phases = [ "unpackPhase" "installPhase" "checkPhase" "fixupPhase" ];
Copy link
Member

Choose a reason for hiding this comment

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

Please use dontBuild = true instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I also had to change the order of the checkPhase though. That means I have to keep it, no?

};

buildInputs = [ jre ];
buildInputs = [ jre makeWrapper ];
Copy link
Member

Choose a reason for hiding this comment

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

makeWrapper should be in nativeBuildInputs.

@markus1189
Copy link
Contributor Author

@volhovm Do you refer to the dontBuild = true comment?

I can add that, but I still need that line because I am reordering the checkPhase to be before the installPhase. Otherwise the check does not work. Should I instead perform the wrapProgram in some other phase?

@markus1189
Copy link
Contributor Author

markus1189 commented Feb 26, 2018

@volth Already included in the latest commit. Thanks for the pr that is much nicer

@Mic92
Copy link
Member

Mic92 commented Feb 26, 2018

there is a bit more wrapping needed:

$ /nix/store/34wdgmwq6gqhzbyzx18sig78jh4yrygz-jmeter-4.0/bin/jmeter-create-rmi-keystore.sh: line 18: keytool: command not found
Copy the generated rmi_keystore.jks to jmeter/bin folder or reference it in property 'server.rmi.ssl.keystore.file'
$ /nix/store/34wdgmwq6gqhzbyzx18sig78jh4yrygz-jmeter-4.0/bin/jmeter-heapdump.sh: line 24: java: command not found
$ /nix/store/34wdgmwq6gqhzbyzx18sig78jh4yrygz-jmeter-4.0/bin/jmeter-mirror-server.sh: line 27: java: command not found
$ /nix/store/34wdgmwq6gqhzbyzx18sig78jh4yrygz-jmeter-4.0/bin/jmeter-mirror-server.sh: line 27: java: command not found

@markus1189
Copy link
Contributor Author

Done ;)

I really like how this came out, it's a good improvement of the old package, thanks for all the feedback!

@Mic92
Copy link
Member

Mic92 commented Feb 27, 2018

the following are still missing java:

$ /nix/store/6867z1rhini3q3qwps2d8brd2k49r2xs-jmeter-4.0/bin/jmeter-shutdown.sh: line 24: java: command not found
$ /nix/store/6867z1rhini3q3qwps2d8brd2k49r2xs-jmeter-4.0/bin/jmeter-stoptest.sh: line 24: java: command not found

@markus1189
Copy link
Contributor Author

Updated and added more tests.

Is the use of timeout okay for the test of the jmeter-mirror-server?

@Mic92
Copy link
Member

Mic92 commented Feb 27, 2018

The test still has java in PATH, if you run it outside, it still misses it:

$ jmeter-shutdown.sh
/nix/store/rz9lbp3i22mj8dcqcpwz4lhlcld3aqpr-jmeter-4.0/bin/.jmeter-shutdown.sh-wrapped: line 24: java: command not found

@markus1189
Copy link
Contributor Author

Should be fixed now

@Mic92 Mic92 merged commit 11de4cf into NixOS:master Feb 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants