Added builder scripts for more code-tools - jcstress, jtharness, sigtest and jcov #766

judovana · 2023-08-07T16:37:46Z

No description provided.

github-actions · 2023-08-07T16:38:00Z

Thank you for creating a pull request!

Please check out the information below if you have not made a pull request here before (or if you need a reminder how things work).

Code Quality and Contributing Guidelines

If you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before.

Tests

Github actions will run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

In order to run the advanced pipeline tests (executing a set of mock pipelines), it requires an admin to post run tests on this PR.
If you are not an admin, please ask for one's attention in #infrastructure on Slack or ping one here.
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,20"

judovana · 2023-08-07T16:38:15Z

If you would create a staging jenkins job, it wouldbe awesome.

tools/code-tools/jcstress.sh

karianna · 2023-08-07T18:08:49Z

tools/code-tools/jcstress.sh

+}
+
+function detectJdks() {
+  jvm_dir="/usr/lib/jvm/"


This only builds on Linux, I wonder if there's a more O/S independent way to pass the java in

For our CI farm we can of course pin to a Linux node if need be

Looks like below that Java 11 is required?

karianna · 2023-08-07T18:09:24Z

tools/code-tools/jcstress.sh

+  # latest released
+  git checkout $latestRelease
+  export JAVA_HOME=$jdk11
+  mvn clean install


assumes mvn is installed on build host

karianna · 2023-08-07T18:09:33Z

tools/code-tools/jcstress.sh

+  git checkout $latestRelease
+  export JAVA_HOME=$jdk11
+  mvn clean install
+  mv tests-all/target/jcstress.jar  $rc


Suggested change

mv tests-all/target/jcstress.jar $rc

mv tests-all/target/jcstress.jar $rc

karianna · 2023-08-07T18:09:58Z

tools/code-tools/jcstress.sh

+  git checkout master
+  export JAVA_HOME=$jdk11
+  mvn clean install
+  mv tests-all/target/$main_file  $main_name-$tip_shortened.jar


Suggested change

mv tests-all/target/$main_file $main_name-$tip_shortened.jar

mv tests-all/target/$main_file $main_name-$tip_shortened.jar

judovana · 2023-08-08T05:56:40Z

Hello!
Thanx a lot for eyball!
Will fix the spaces. Sorry for that. I will add the comment header a separate changeset to all scripts in this directory (I'm planning to add also jtharness, sigtests and jcov).

As for the mvn and linux concerns, they are all valid, but based on other scripts this https://github.com/adoptium/ci-jenkins-pipelines/blob/master/tools/code-tools/Jenkinsfile is running, and the deployment of this pipeline, the mvn and linux and /sur/lib/jvm is expected combo, so I would not change that.

As for the jdk, I will remove the non jdk11 versions (unless you say otherwise). I actually thought, that there will be 3 jcstress artifacts - one old, for jdk8, built by jdk8, 16, b uilt by jdk11 for jdk 9-20 and tip, built by jdk 17, for jdk17 and up. But my information were misshaped, and all thre variants builds by jdk11 and works fine for jdks 8-20.
It may happen, that jdk21 will enforce a change on this part due to bytecode incompatiblity, but that is not yet in jcstress itself.

judovana · 2023-08-08T10:28:32Z

Doubel sapces removed and jdk count reduced in rebase

judovana · 2023-08-08T11:10:30Z

Your remarks have been resolved in best will. How does it look to you now?

karianna · 2023-08-08T16:45:43Z

tools/code-tools/javatest.sh

+#!/bin/bash
+
+###################################################################
+# Scrtipt to build jtharness reusable by jdk testing community    #


Suggested change

# Scrtipt to build jtharness reusable by jdk testing community #

# Script to build jtharness reusable by jdk testing community #

karianna · 2023-08-08T16:45:55Z

tools/code-tools/asmtools.sh

 #!/bin/bash
+
+###################################################################
+# Scrtipt to build asmtools to be reused by jdk testing community #


Suggested change

# Scrtipt to build asmtools to be reused by jdk testing community #

# Script to build asmtools to be reused by jdk testing community #

karianna · 2023-08-08T16:46:11Z

tools/code-tools/javatest.sh

+
+###################################################################
+# Scrtipt to build jtharness reusable by jdk testing community    #
+# currenlty builds tip and latest released version                #


Suggested change

# currenlty builds tip and latest released version #

# currently builds tip and latest released version #

karianna · 2023-08-08T16:46:20Z

tools/code-tools/asmtools.sh

+
+###################################################################
+# Scrtipt to build asmtools to be reused by jdk testing community #
+# currenlty builds tip of master and tip of at8 branch            #


Suggested change

# currenlty builds tip of master and tip of at8 branch #

# currently builds tip of master and tip of at8 branch #

karianna · 2023-08-08T16:47:08Z

tools/code-tools/jcstress.sh

+#!/bin/bash
+
+###################################################################
+# Scrtipt to build jcstress to be reused by jdk testing community #


Suggested change

# Scrtipt to build jcstress to be reused by jdk testing community #

# Script to build jcstress to be reused by jdk testing community #

karianna · 2023-08-08T16:47:16Z

tools/code-tools/jcstress.sh

+
+###################################################################
+# Scrtipt to build jcstress to be reused by jdk testing community #
+# currenlty builds tip and latest released version                #


Suggested change

# currenlty builds tip and latest released version #

# currently builds tip and latest released version #

karianna · 2023-08-08T16:47:41Z

tools/code-tools/jtreg.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
+
+###################################################################
+# Scrtipt to build jtreg test suite harness                       #


Suggested change

# Scrtipt to build jtreg test suite harness #

# Script to build jtreg test suite harness #

karianna · 2023-08-08T16:47:52Z

tools/code-tools/jtreg.sh

+
+###################################################################
+# Scrtipt to build jtreg test suite harness                       #
+# currenlty builds tip, 5.1, 6, 6.1, 7, 7.1, 7.2                  #


Suggested change

# currenlty builds tip, 5.1, 6, 6.1, 7, 7.1, 7.2 #

# currently builds tip, 5.1, 6, 6.1, 7, 7.1, 7.2 #

judovana · 2023-08-09T06:15:47Z

//me counting typo free lines
...2!

Sorry,:( all fixed, ty!

judovana · 2023-08-09T18:10:43Z

@karianna ty! @sophia-guo ca you set up a staging job for me please?

karianna · 2023-08-15T06:53:28Z

tools/code-tools/jcov.sh

+     mv testng-$testngv.jar testng.jar
+   fi
+   if [ ! -e jcommander.jar ] ; then
+     jcommanderv=1.81


Suggested change

jcommanderv=1.81

local jcommanderv=1.81

judovana · 2023-08-15T13:27:25Z

@karianna Sharp eye! fixed. TYVM!

judovana · 2023-08-15T16:41:06Z

Usptream issue dealing with versions of jcov deps: https://bugs.openjdk.org/browse/CODETOOLS-7903520

sophia-guo · 2023-08-15T20:49:44Z

tools/code-tools/sigtest.sh

+WORKSPACE=$PWD
+
+function hashArtifacts() {
+  echo "Creating checksums all sigtest*.jar"


sigtest*.jar --> sigtest*.zip?

sophia-guo · 2023-08-15T21:01:50Z

I noticed that stage('sigtest') isn't added, is that expected?

Currently the stage('jtreg') builds jtreg.jar, which includes javatest.jar, asmtools.jar, jcov.jar and jcov_network_saver.jar, will the stage('javatest') and stage('jcov') be duplicate?

judovana · 2023-08-16T13:00:00Z

Missing stage ro sigtest is error. Will fix. sorry.

Jtreg indeed downloads/builds its deps as it needs to do. They are version-less, and are not published as standalone artifacts.
Afaik it have sense to build all code-tools in the view of tip and latest released and soemtimes somespecial part (as eg asmtools does) and elave jtreg to pull what it needs.

But I do not insists. If you would eg rather copy the javatest and other similar artifacts out of jtreg.tar.gz then it can be done. But IMHO it is really different target.

judovana · 2023-08-16T13:06:02Z

damn. ty!

-- Mgr. Jiri Vanek ***@***.***

---------- Původní e-mail ---------- Od: sophia-guo ***@***.***> Komu: adoptium/ci-jenkins-pipelines ***@***.***

Kopie: judovana ***@***.***>, Mention ***@***.***> Datum: 15. 8. 2023 22:49:59 Předmět: Re: [adoptium/ci-jenkins-pipelines] Added builder scripts for more code-tools - jcstress, jtharness, sigtest and jcov (PR #766) " @sophia-guo commented on this pull request. ---------------------------------------------------------------------------- In tools/code-tools/sigtest.sh (#766 (comment)) :

@@ -0,0 +1,105 @@

+#!/bin/bash + +################################################################### +# Script to build sigtest reusable by jdk testing community # +# currently builds tip and latest released version # +################################################################### + +# shellcheck disable=SC2035,SC2155 +set -euo pipefail +WORKSPACE=$PWD + +function hashArtifacts() { + echo "Creating checksums all sigtest*.jar" sigtest*.jar --> sigtest*.zip? — Reply to this email directly, view it on GitHub (#766 (review)) , or unsubscribe (https://github.com/notifications/unsubscribe-auth/AAWFCS6F5SXPEOFCNQMDHA3XVPOHHANCNFSM6AAAAAA3HHZ564) . You are receiving this because you were mentioned. Message ID: <adoptium/ci- ***@***.***> "

three tests are failing, and I think it is due to testng and jcommander version clash, but I had failed to set better versions combinations. This needs to be elaborate in upstream

judovana · 2023-08-16T13:55:36Z

Both issues fixed. Thank you.

sophia-guo

LGTM. Thanks @judovana

judovana · 2023-08-16T14:38:07Z

Wait you merged it without staging job? :D I'm doomed..... Will keep en eye.. and tbh, I doubt I declared all the artifacts 100% correctly

judovana · 2023-08-16T16:09:03Z

I can see the PR had all commits squashed. Is that a policy? The commits were maintained to be intentionally commit per script.

In https://ci.adoptium.net/view/Dependencies/job/dependency_pipeline/896/ are three errors:

jcov is missing in Jenkins file - I started to think git merge/reabse is doing something wrong
- will fix
the version less simlinks are missing
- I will replace soft link by hard links
the clone of javatest is failing, becasue the repo is actually named jtharness. I forget the jenkisn file is doing the clone on my behalf. Will fix too by renaming the stage to jtharness, and adjust artifacts

judovana · 2023-08-16T16:55:08Z

#783 is fixing ^

…est and jcov (adoptium#766) * Added builder script for code-tools/jcstress * Added description to the code-tools build scripts * Added builder for jtharness * Added script for generating sigtest releases * Added builder for jcov * Added testrun for jcov three tests are failing, and I think it is due to testng and jcommander version clash, but I had failed to set better versions combinations. This needs to be elaborate in upstream

karianna requested changes Aug 7, 2023

View reviewed changes

judovana force-pushed the jcstress branch from 573fb5e to 7d08e03 Compare August 8, 2023 10:28

judovana force-pushed the jcstress branch from 2b9bba8 to ca5a508 Compare August 8, 2023 13:55

Added builder script for code-tools/jcstress

3bcd495

judovana force-pushed the jcstress branch from ca5a508 to 53f0dee Compare August 8, 2023 14:02

judovana changed the title ~~Added builder script for code-tools/jcstress~~ Added builder script for more code-tools - jcstress, jtharness Aug 8, 2023

judovana changed the title ~~Added builder script for more code-tools - jcstress, jtharness~~ Added builder scripts for more code-tools - jcstress, jtharness Aug 8, 2023

judovana force-pushed the jcstress branch from 9b3a1cc to 761188d Compare August 8, 2023 14:46

karianna requested changes Aug 8, 2023

View reviewed changes

Added description to the code-tools build scripts

fb6e70e

judovana force-pushed the jcstress branch from 761188d to 3eca8f7 Compare August 9, 2023 06:15

karianna approved these changes Aug 9, 2023

View reviewed changes

Added builder for jtharness

dae215e

judovana force-pushed the jcstress branch from 3eca8f7 to dae215e Compare August 10, 2023 14:25

judovana changed the title ~~Added builder scripts for more code-tools - jcstress, jtharness~~ Added builder scripts for more code-tools - jcstress, jtharness, sigtest Aug 14, 2023

judovana force-pushed the jcstress branch from a3f86fd to f0c9491 Compare August 14, 2023 11:55

github-actions bot added the testing label Aug 14, 2023

judovana force-pushed the jcstress branch from f0c9491 to 6d079ed Compare August 14, 2023 11:56

github-actions bot added testing and removed testing labels Aug 14, 2023

judovana force-pushed the jcstress branch from 6d079ed to 1bba95f Compare August 14, 2023 11:56

github-actions bot added testing and removed testing labels Aug 14, 2023

github-actions bot added the testing label Aug 14, 2023

judovana force-pushed the jcstress branch from 027fb3c to 3277719 Compare August 14, 2023 14:46

github-actions bot added testing and removed testing labels Aug 14, 2023

karianna approved these changes Aug 15, 2023

View reviewed changes

judovana force-pushed the jcstress branch from 5919bc4 to 4c457af Compare August 15, 2023 13:27

github-actions bot added testing and removed testing labels Aug 15, 2023

sophia-guo reviewed Aug 15, 2023

View reviewed changes

judovana added 3 commits August 16, 2023 15:28

Added script for generating sigtest releases

ab383e9

Added builder for jcov

414d560

Added testrun for jcov

330b4c1

three tests are failing, and I think it is due to testng and jcommander version clash, but I had failed to set better versions combinations. This needs to be elaborate in upstream

judovana force-pushed the jcstress branch from 4c457af to 330b4c1 Compare August 16, 2023 13:55

github-actions bot added testing and removed testing labels Aug 16, 2023

sophia-guo approved these changes Aug 16, 2023

View reviewed changes

sophia-guo merged commit 41a2467 into adoptium:master Aug 16, 2023
6 checks passed

judovana mentioned this pull request Aug 16, 2023

Fixing code tools #783

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added builder scripts for more code-tools - jcstress, jtharness, sigtest and jcov #766

Added builder scripts for more code-tools - jcstress, jtharness, sigtest and jcov #766

judovana commented Aug 7, 2023

github-actions bot commented Aug 7, 2023

judovana commented Aug 7, 2023

karianna Aug 7, 2023

karianna Aug 7, 2023

karianna Aug 7, 2023

karianna Aug 7, 2023

karianna Aug 7, 2023

karianna Aug 7, 2023

judovana commented Aug 8, 2023

judovana commented Aug 8, 2023

judovana commented Aug 8, 2023

karianna Aug 8, 2023

karianna Aug 8, 2023

karianna Aug 8, 2023

karianna Aug 8, 2023

karianna Aug 8, 2023

karianna Aug 8, 2023

karianna Aug 8, 2023

karianna Aug 8, 2023

judovana commented Aug 9, 2023

judovana commented Aug 9, 2023

karianna Aug 15, 2023

judovana commented Aug 15, 2023

judovana commented Aug 15, 2023

sophia-guo Aug 15, 2023

sophia-guo commented Aug 15, 2023

judovana commented Aug 16, 2023

judovana commented Aug 16, 2023 via email

judovana commented Aug 16, 2023

sophia-guo left a comment

judovana commented Aug 16, 2023

judovana commented Aug 16, 2023

judovana commented Aug 16, 2023

	mv tests-all/target/jcstress.jar $rc
	mv tests-all/target/jcstress.jar $rc

	mv tests-all/target/$main_file $main_name-$tip_shortened.jar
	mv tests-all/target/$main_file $main_name-$tip_shortened.jar

	# Scrtipt to build jtharness reusable by jdk testing community #
	# Script to build jtharness reusable by jdk testing community #

	# Scrtipt to build asmtools to be reused by jdk testing community #
	# Script to build asmtools to be reused by jdk testing community #

	# currenlty builds tip and latest released version #
	# currently builds tip and latest released version #

	# currenlty builds tip of master and tip of at8 branch #
	# currently builds tip of master and tip of at8 branch #

	# Scrtipt to build jcstress to be reused by jdk testing community #
	# Script to build jcstress to be reused by jdk testing community #

	# Scrtipt to build jtreg test suite harness #
	# Script to build jtreg test suite harness #

	# currenlty builds tip, 5.1, 6, 6.1, 7, 7.1, 7.2 #
	# currently builds tip, 5.1, 6, 6.1, 7, 7.1, 7.2 #

Added builder scripts for more code-tools - jcstress, jtharness, sigtest and jcov #766

Added builder scripts for more code-tools - jcstress, jtharness, sigtest and jcov #766

Conversation

judovana commented Aug 7, 2023

github-actions bot commented Aug 7, 2023

Thank you for creating a pull request!

Code Quality and Contributing Guidelines

Tests

judovana commented Aug 7, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

judovana commented Aug 8, 2023

judovana commented Aug 8, 2023

judovana commented Aug 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

judovana commented Aug 9, 2023

judovana commented Aug 9, 2023

Choose a reason for hiding this comment

judovana commented Aug 15, 2023

judovana commented Aug 15, 2023

Choose a reason for hiding this comment

sophia-guo commented Aug 15, 2023

judovana commented Aug 16, 2023

judovana commented Aug 16, 2023 via email

judovana commented Aug 16, 2023

sophia-guo left a comment

Choose a reason for hiding this comment

judovana commented Aug 16, 2023

judovana commented Aug 16, 2023

judovana commented Aug 16, 2023