summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@yahooinc.com>2023-02-27 16:44:22 +0100
committerArnstein Ressem <aressem@yahooinc.com>2023-03-06 17:27:05 +0100
commit20641097dfea3ff122e5c15ca7a9bfd7ebbe82a5 (patch)
tree18ee20587aa105686cd383eed4f2fb0f1ba8568f /dist
parentf39d2844563d3e28ef2471cb0c6ee81ae310185f (diff)
Add job to publish generic Intel based container image
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec10
1 files changed, 9 insertions, 1 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index f1bfb1c0fef..76fa0dabb77 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -452,17 +452,25 @@ export FACTORY_VESPA_VERSION=%{version}
mvn --batch-mode -e -N io.takari:maven:wrapper -Dmaven=3.6.3
%endif
%{?_use_mvn_wrapper:env VESPA_MAVEN_COMMAND=$(pwd)/mvnw }sh bootstrap.sh java
-%{?_use_mvn_wrapper:./mvnw}%{!?_use_mvn_wrapper:mvn} --batch-mode -nsu -T 1C install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
+%{?_use_mvn_wrapper:./mvnw}%{!?_use_mvn_wrapper:mvn} --batch-mode -nsu -T 1C install -DskipTests -Dmaven.javadoc.skip=true
%{_command_cmake} -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DJAVA_HOME=$JAVA_HOME \
-DVESPA_USER=%{_vespa_user} \
-DVESPA_UNPRIVILEGED=no \
+ %{_cmake_extra_opts} \
.
make %{_smp_mflags}
VERSION=%{version} CI=true make -C client/go install-all
%endif
+%check
+%if ! 0%{?installdir:1}
+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}"
+%endif
+
%install
rm -rf %{buildroot}