This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 1588a0e add qa-functional and use cluster in place of module
1588a0e is described below
commit 1588a0e11807b18b64c7831f47d5d73c6fc5e236
Author: Eric Barboni <[email protected]>
AuthorDate: Tue Mar 22 17:38:06 2022 +0100
add qa-functional and use cluster in place of module
---
jobs/Jenkinsmatrixfile.groovy | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/jobs/Jenkinsmatrixfile.groovy b/jobs/Jenkinsmatrixfile.groovy
index be5db0a..0228f21 100644
--- a/jobs/Jenkinsmatrixfile.groovy
+++ b/jobs/Jenkinsmatrixfile.groovy
@@ -46,7 +46,7 @@ pipeline {
}
}
- stage ("EffectiveMatrix")
+ stage ("EffectiveMatrixClustersUNITQA")
{
matrix {
agent { node { label 'ubuntu' } }
@@ -57,7 +57,7 @@ pipeline {
values 'jdk_1.8_latest', 'jdk_11_latest',
'jdk_17_latest'
}
axis {
- name 'MODULE'
+ name 'CLUSTER'
values 'platform', 'ide'
}
}
@@ -72,19 +72,20 @@ pipeline {
unstash 'idebuildzip'
unzip zipFile: 'nbbuild/build/testdist.zip',
dir:'testdir'
unzip zipFile: 'zip/NetBeansIDE.zip',
dir:'netbeans'
- sh "mkdir -p
${WORKSPACE}/result/unit/${env.JDK}/${env.MODULE} "
+ sh "mkdir -p
${WORKSPACE}/result/unit/${env.JDK}/${env.CLUSTER} "
sh 'java -version'
//sh 'ant -version'
// this is not finished
wrap([$class: 'Xvfb', additionalOptions: '',
assignedLabels: '', displayNameOffset: 0, autoDisplayName:true,
installationName: 'Xvfb', parallelBuild: true, screen: '']) {
// echo to return 0 and go further
- sh "ant -f ${WORKSPACE}/testdir/build.xml
-Dtest-sys-prop.ignore.random.failures=true
-Dtest.results.dir=${WORKSPACE}/result/unit/${env.JDK}/${env.MODULE}
-Dtest.clusters=${env.MODULE} -Dtest.types=unit
-Dnetbeans.dest.dir=${WORKSPACE}/netbeans/netbeans || echo Failed "
+ // do unit ant put in result folder
+ sh "ant -f ${WORKSPACE}/testdir/build.xml
-Dtest-sys-prop.ignore.random.failures=true
-Dtest.results.dir=${WORKSPACE}/result/unit/${env.JDK}/${env.CLUSTER}
-Dtest.types=unit -Dtest.clusters=${env.CLUSTER}
-Dnetbeans.dest.dir=${WORKSPACE}/netbeans/netbeans || echo Failed "
+ // do qa-functional and put in result
folder
+ sh "ant -f ${WORKSPACE}/testdir/build.xml
-Dtest-sys-prop.ignore.random.failures=true
-Dtest.results.dir=${WORKSPACE}/result/qa-functional/${env.JDK}/${env.CLUSTER}
-Dtest.types=qa-functional -Dtest.clusters=${env.CLUSTER}
-Dnetbeans.dest.dir=${WORKSPACE}/netbeans/netbeans || echo Failed "
+
}
- // do not use TESTS- as it's redundant with
TEST- (inverted to check report readability)
- junit
"result/unit/${env.JDK}/${env.MODULE}/**/TESTS-*.xml"
- //sh "ant -f ${WORKSPACE}/testdir/build.xml
-Dtest.clusters=${env.MODULE} -Dtest.types=qa-functional
-Dnetbeans.dest.dir=${WORKSPACE}/netbeans/netbeans"
- // html can be done but unusable from jenkins
- //archiveArtifacts artifacts:
"result/unit/${env.JDK}/${env.MODULE}/**/*"
+ archiveArtifacts artifacts:
"result/unit/${env.JDK}/${env.CLUSTER}/**/*"
+ archiveArtifacts artifacts:
"result/qa-functional/${env.JDK}/${env.CLUSTER}/**/*"
}
}
@@ -93,6 +94,8 @@ pipeline {
}
}
+
+ /* */
}
post {
cleanup {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
