From 126c885d81d5a07abef980d893d2d7a05f7bfbe8 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 9 Apr 2020 10:15:00 -0400 Subject: [PATCH 1/3] https://github.com/jenkinsci/workflow-job-plugin/pull/158 --- pct.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pct.sh b/pct.sh index 2c641c6a5..74f332b4c 100755 --- a/pct.sh +++ b/pct.sh @@ -71,6 +71,8 @@ rm -fv pct-work/workflow-durable-task-step/target/surefire-reports/TEST-org.jenk rm -fv pct-work/workflow-durable-task-step/target/surefire-reports/TEST-org.jenkinsci.plugins.workflow.support.steps.ExecutorStepTest.xml rm -fv pct-work/workflow-cps/target/surefire-reports/TEST-org.jenkinsci.plugins.workflow.cps.FlowDurabilityTest.xml rm -fv pct-work/junit/target/surefire-reports/TEST-hudson.tasks.junit.pipeline.JUnitResultsStepTest.xml +# https://github.com/jenkinsci/workflow-job-plugin/pull/158 +rm -fv pct-work/workflow-job/target/surefire-reports/TEST-org.jenkinsci.plugins.workflow.job.WorkflowRunRestartTest.xml # TODO pending https://github.com/jenkinsci/ansicolor-plugin/pull/164 rm -fv pct-work/ansicolor/target/surefire-reports/TEST-hudson.plugins.ansicolor.AnsiColorBuildWrapperTest.xml From 48129b74d486fa65c083a82a860f8c1d550f5fdc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 9 Apr 2020 10:16:32 -0400 Subject: [PATCH 2/3] Suppress maybePublishIncrementals for now; due to INFRA-2548 it could break the build, and due to INFRA-2544 it was not working anyway --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index bcbe2ef16..503a0eade 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,4 +70,6 @@ lines.each {line -> } parallel branches +/* TODO INFRA-2548 + INFRA-2544 infra.maybePublishIncrementals() +*/ From 703f11281f599ad951a3b170d13a4dc535c684b6 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 9 Apr 2020 10:24:40 -0400 Subject: [PATCH 3/3] https://github.com/jenkinsci/plugin-compat-tester/pull/228 --- prep.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/prep.sh b/prep.sh index efa2c8d55..eba193523 100755 --- a/prep.sh +++ b/prep.sh @@ -41,9 +41,10 @@ do done # TODO find a way to encode this in some POM so that it can be managed by Dependabot -version=0.5.0 -pct=$HOME/.m2/repository/org/jenkins-ci/tests/plugins-compat-tester-cli/${version}/plugins-compat-tester-cli-${version}.jar -[ -f $pct ] || $MVN dependency:get -Dartifact=org.jenkins-ci.tests:plugins-compat-tester-cli:${version}:jar -DremoteRepositories=https://repo.jenkins-ci.org/public/ -Dtransitive=false +version=0.5.1 +timestamp=20200409.141743-1 # TODO https://github.com/jenkinsci/plugin-compat-tester/pull/228 +pct=$HOME/.m2/repository/org/jenkins-ci/tests/plugins-compat-tester-cli/${version}-SNAPSHOT/plugins-compat-tester-cli-${version}-${timestamp}.jar +[ -f $pct ] || $MVN dependency:get -Dartifact=org.jenkins-ci.tests:plugins-compat-tester-cli:${version}-${timestamp}:jar -DremoteRepositories=https://repo.jenkins-ci.org/public/ -Dtransitive=false cp $pct target/pct.jar # produces: target/{megawar-*.war,pct.jar,plugins.txt,lines.txt}