Skip to content

Commit

Permalink
Fixups to jenkinsci#1918
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed Mar 31, 2023
1 parent a639fb0 commit 00e2a7c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ stage('prep') {
lines = [lines[0], lines[-1]] // run PCT only on newest and oldest lines, to save resources
}
stash name: 'pct', includes: 'pct.jar'
launchable.install()
lines.each { line ->
def commitHashes = readFile "commit-hashes-${line}.txt"
launchable.install()
launchable("record build --name \"${BUILD_TAG}-${line}\" --no-commit-collection " + commitHashes)
launchable("record session --build \"${BUILD_TAG}-${line}\" --observation >launchable-session-${line}.txt")
stash name: "megawar-${line}", includes: "megawar-${line}.war"
Expand Down
28 changes: 15 additions & 13 deletions prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,22 @@ for LINE in $LINEZ; do
cd "megawar-${LINE}"
jar c0Mf "../../../target/megawar-${LINE}.war" *
popd
if [[ ${LINE} != weekly ]]; then
PROFILE="-P${LINE}"
if [[ -n ${CI-} ]]; then
if [[ ${LINE} != weekly ]]; then
PROFILE="-P${LINE}"
fi
# TODO https://github.com/jenkinsci/maven-hpi-plugin/pull/464
$MVN \
-f sample-plugin \
hpi:resolve-test-dependencies \
${SAMPLE_PLUGIN_OPTS:-} \
${PROFILE:-} \
-DoverrideWar="../target/megawar-${LINE}.war" \
-DuseUpperBounds \
-Dhpi-plugin.version=3.42-rc1409.669de6d1a_866 \
-DcommitHashes=target/commit-hashes.txt
mv sample-plugin/target/commit-hashes.txt "target/commit-hashes-${LINE}.txt"
fi
# TODO https://github.com/jenkinsci/maven-hpi-plugin/pull/464
$MVN \
-f sample-plugin \
hpi:resolve-test-dependencies \
${SAMPLE_PLUGIN_OPTS:-} \
${PROFILE:-} \
-DoverrideWar="../target/megawar-${LINE}.war" \
-DuseUpperBounds \
-Dhpi-plugin.version=3.42-rc1409.669de6d1a_866 \
-DcommitHashes=target/commit-hashes.txt
mv sample-plugin/target/commit-hashes.txt "target/commit-hashes-${LINE}.txt"
done

# Tracked by ./updatecli/updatecli.d/plugin-compat-tester.yml
Expand Down

0 comments on commit 00e2a7c

Please sign in to comment.