This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 3ceb1abd8b4 smokeTestRelease.py: conditional X-Build-JDK check (#5304)
3ceb1abd8b4 is described below
commit 3ceb1abd8b4586dc02a71a3dc2a4605830106087
Author: David Smiley <[email protected]>
AuthorDate: Fri Nov 6 10:00:13 2026 -0500
smokeTestRelease.py: conditional X-Build-JDK check (#5304)
SMOKETEST_SRC_TEST_TASK allows the CI job for the smoke tester to build
with JDK 25 or higher (i.e. not strictly the intended release JDK)
---
dev-tools/scripts/releaseDryRun.sh | 3 +++
dev-tools/scripts/smokeTestRelease.py | 9 ++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dev-tools/scripts/releaseDryRun.sh
b/dev-tools/scripts/releaseDryRun.sh
index b34d78a87b9..1392c58cbad 100755
--- a/dev-tools/scripts/releaseDryRun.sh
+++ b/dev-tools/scripts/releaseDryRun.sh
@@ -38,5 +38,8 @@ python3 -u dev-tools/scripts/buildAndPushRelease.py
--dev-mode --push-local "$TM
# Unit tests run in the regular CI jobs; here just check that the source
release compiles.
export SMOKETEST_SRC_TEST_TASK=testClasses
+# CI may build with a newer JDK than the release JDK.
+export SMOKETEST_SKIP_BUILD_JDK_CHECK=1
+
python3 -u dev-tools/scripts/smokeTestRelease.py --not-signed --tmp-dir
"$TMP_ROOT/smoke" \
"file://$TMP_ROOT/dist/solr-$VERSION-RC1-rev-$(git rev-parse HEAD)"
diff --git a/dev-tools/scripts/smokeTestRelease.py
b/dev-tools/scripts/smokeTestRelease.py
index e451f1cdacc..ebaba69fbc2 100755
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -166,7 +166,7 @@ def checkJARMetaData(desc, jarFile, gitRevision, version):
compileJDK = BASE_JAVA_VERSION
if 'solrj' in desc or 'api' in desc:
compileJDK = SOLRJ_JAVA_VERSION
- for verify in (
+ checks = [
'Specification-Vendor: The Apache Software Foundation',
'Implementation-Vendor: The Apache Software Foundation',
'Specification-Title: Apache Solr Search Server:',
@@ -174,8 +174,11 @@ def checkJARMetaData(desc, jarFile, gitRevision, version):
'X-Compile-Source-JDK: %s' % compileJDK,
'X-Compile-Target-JDK: %s' % compileJDK,
'Specification-Version: %s' % version.replace('-SNAPSHOT', ''),
- 'X-Build-JDK: %s' % BASE_JAVA_VERSION,
- 'Extension-Name: org.apache.solr'):
+ 'Extension-Name: org.apache.solr']
+ # CI may build the RC with a JDK other than BASE_JAVA_VERSION
+ if not os.environ.get('SMOKETEST_SKIP_BUILD_JDK_CHECK'):
+ checks.append('X-Build-JDK: %s' % BASE_JAVA_VERSION)
+ for verify in checks:
if type(verify) is not tuple:
verify = (verify,)
for x in verify:
