You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2022/03/02 23:32:10 UTC
[maven-surefire] branch ci-reporting updated: fix this label os selection
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch ci-reporting
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/ci-reporting by this push:
new 22944b6 fix this label os selection
22944b6 is described below
commit 22944b6962e2f1e6452c7d6ce62f9ed8c8578bba
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Mar 3 09:31:58 2022 +1000
fix this label os selection
Signed-off-by: Olivier Lamy <ol...@apache.org>
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d84257e..7b53b26 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ properties(
disableConcurrentBuilds()
]
)
-final def oses = ['ubuntu', 'windows']
+final def oses = ['linux', 'windows']
final def mavens = env.BRANCH_NAME == 'master' ? ['3.8.x', '3.2.x'] : ['3.8.x']
// all non-EOL versions and the first EA
// make 11 first for ci-reporting to avoid too complicated script
@@ -44,7 +44,7 @@ oses.eachWithIndex { osMapping, indexOfOs ->
mavens.eachWithIndex { maven, indexOfMaven ->
jdks.eachWithIndex { jdk, indexOfJdk ->
def os = oses[indexOfOs]
- def label = os
+ def label = jenkinsEnv.labelForOS(os)
final String jdkName = jenkinsEnv.jdkFromVersion(os, jdk.toString())
final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
final String stageKey = "${os}-jdk${jdk}-maven${maven}"