From 878f80675a20ace0dc0caffa3360679bc0075ed8 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 16 Aug 2023 18:49:56 +0200 Subject: [PATCH] Renamed javatest.sh to jtharness.sh to fit Jenkinsfile's clonning --- tools/code-tools/Jenkinsfile | 6 +++--- tools/code-tools/{javatest.sh => jtharness.sh} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename tools/code-tools/{javatest.sh => jtharness.sh} (100%) diff --git a/tools/code-tools/Jenkinsfile b/tools/code-tools/Jenkinsfile index 731c5362a..fc8b4cd8e 100644 --- a/tools/code-tools/Jenkinsfile +++ b/tools/code-tools/Jenkinsfile @@ -34,12 +34,12 @@ pipeline { build('jtreg') } } - stage('javatest') { + stage('jtharness') { agent { label NODE_LABEL } steps { - build('javatest') + build('jtharness') } } stage('sigtest') { @@ -84,7 +84,7 @@ def build(stageName) { checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${stageName}"]], submoduleCfg: [], userRemoteConfigs: [[url: toolsUrl]]]) } sh label: "${stageName}", script: "./tools/code-tools/${stageName}.sh" - archiveArtifacts artifacts: "**/temurin-*-sbom.jar, ${stageName}/*.tar.gz, ${stageName}/${stageName}*.jar, ${stageName}/${stageName}*.jar.*.txt,${stageName}/${stageName}*.tar.gz.*.txt, ${stageName}/*.tar.gz.*sum*.txt, ${stageName}/${stageName}*.jar.html, ${stageName}/${stageName}*.jar.md, ${stageName}/${stageName}*.zip", followSymlinks: false + archiveArtifacts artifacts: "**/temurin-*-sbom.jar, ${stageName}/*.tar.gz, ${stageName}/${stageName}*.jar, ${stageName}/${stageName}*.jar.*.txt,${stageName}/${stageName}*.tar.gz.*.txt, ${stageName}/*.tar.gz.*sum*.txt, ${stageName}/${stageName}*.jar.html, ${stageName}/${stageName}*.jar.md, ${stageName}/${stageName}*.zip, ${stageName}/javatest*.jar, ${stageName}/javatest.*sum*.txt", followSymlinks: false } catch (Exception e) { slackSend channel: 'jenkins', color: 'danger', message: "${env.JOB_NAME} : #${env.BUILD_NUMBER} : ${stageName}() FAILED with following error message:\n${e}", teamDomain: 'adoptium' throw new Exception("[ERROR] ${stageName} FAILED\n${e}") diff --git a/tools/code-tools/javatest.sh b/tools/code-tools/jtharness.sh similarity index 100% rename from tools/code-tools/javatest.sh rename to tools/code-tools/jtharness.sh