Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check altered resolve-test-dependencies behavior #1372

Closed
wants to merge 3 commits into from
Closed

Check altered resolve-test-dependencies behavior #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a11be62
Check altered `resolve-test-dependencies` behavior
jglick Aug 2, 2022
91a5e80
Merge branch 'master' of https://github.com/jenkinsci/bom into resolv…
jglick Aug 4, 2022
021defb
Use https://github.com/jenkinsci/plugin-compat-tester/pull/378 to pas…
jglick Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pct.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jar xf ../megawar.war META-INF/MANIFEST.MF
JENKINS_VERSION=$(perl -w -p -0777 -e 's/\r?\n //g' META-INF/MANIFEST.MF | grep Jenkins-Version | awk '{print $2}')
popd
rm -rf pct-work
MAVEN_PROPERTIES+=":jenkins.version=${JENKINS_VERSION}:overrideWar=$(pwd)/megawar.war:useUpperBounds=true"
MAVEN_PROPERTIES+=":jenkins.version=${JENKINS_VERSION}:overrideWar=$(pwd)/megawar.war:overrideWarAdditions=true:useUpperBounds=true"

#
# The overrideWar option is available in HPI Plugin 3.29 or later, but many plugins under test
Expand All @@ -40,7 +40,8 @@ MAVEN_PROPERTIES+=":jenkins.version=${JENKINS_VERSION}:overrideWar=$(pwd)/megawa
# TODO When all plugins in the managed set are using a plugin parent POM with HPI Plugin 3.29 or
# later (i.e., plugin parent POM 4.44 or later), this can be deleted.
#
MAVEN_PROPERTIES+=:hpi-plugin.version=3.31
# TODO https://github.com/jenkinsci/maven-hpi-plugin/pull/373
MAVEN_PROPERTIES+=:hpi-plugin.version=3.33-rc1300.688edc5b_c3c8

#
# Define the excludes for upper bounds checking. We define these excludes in a separate file and
Expand Down Expand Up @@ -100,6 +101,7 @@ java \
-mavenProperties "${MAVEN_PROPERTIES}" \
-excludeHooks org.jenkins.tools.test.hook.TransformPom \
-mavenPropertiesFile "$(pwd)/maven.properties" \
-mavenOptions -Pconsume-incrementals \
-skipTestCache true

if grep -q -F -e '<status>INTERNAL_ERROR</status>' pct-report.xml; then
Expand Down
2 changes: 1 addition & 1 deletion prep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ for LINE in $LINEZ; do
done

# TODO find a way to encode this in some POM so that it can be managed by Dependabot
version=1180.v0e40e65a81e1
version=1189.va889cc19d99c # TODO https://github.com/jenkinsci/plugin-compat-tester/pull/378
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/,https://repo.jenkins-ci.org/incrementals/ -Dtransitive=false
cp "${pct}" target/pct.jar
Expand Down