diff options
| author | Tor Egge <Tor.Egge@online.no> | 2023-03-06 19:59:45 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2023-03-06 19:59:45 +0100 |
| commit | fd595ddab2a8e6ba3a8881648e83858d266bbe2e (patch) | |
| tree | 5ca4f768a7e18d181ab56f85ead83a3c31c2fd58 /dist | |
| parent | 7c52e582dc9e30f8853232fab6833bf5f2b1d87b (diff) | |
Use java 17 during %check build stage.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 76fa0dabb77..fd2eda6e107 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -466,6 +466,15 @@ VERSION=%{version} CI=true make -C client/go install-all %check %if ! 0%{?installdir:1} +%if 0%{?_java_home:1} +export JAVA_HOME=%{?_java_home} +%else +export JAVA_HOME=/usr/lib/jvm/java-17-openjdk +%endif +export PATH="$JAVA_HOME/bin:$PATH" +%if 0%{?el8} +python3.9 -m pip install --user pytest +%endif export PYTHONPATH="$PYTHONPATH:/usr/local/lib/$(basename $(readlink -f $(which python3)))/site-packages" #%{?_use_mvn_wrapper:./mvnw}%{!?_use_mvn_wrapper:mvn} --batch-mode -nsu -T 1C -Dmaven.javadoc.skip=true test make test ARGS="--output-on-failure %{_smp_mflags}" |