Merge pull request #36285 from vespa-engine/toregge/run-install-step-before-unit-test-steps

Run install step before unit test steps.

Author: toregge

.buildkite/Makefile

@@ -41,8 +41,8 @@ export VESPA_CONTAINER_IMAGE_VERSION_TAG_SUFFIX ?= -dev-only
 
 .DEFAULT_GOAL := pr
 
-main: build-rpms cpp-test quick-start-guide publish-container publish-artifacts
-pr: build-rpms cpp-test basic-search-test
+main: cpp-test java-test quick-start-guide publish-container publish-artifacts
+pr: basic-search-test
 
 check:
 	@shellcheck -x $(TOP)/*.sh
@@ -59,19 +59,22 @@ bootstrap-cmake: bootstrap
 java: bootstrap
 	@$(TOP)/execute.sh $@
 
+java-test: install
+	@$(TOP)/execute.sh $@
+
 cpp: bootstrap-cmake
 	@$(TOP)/execute.sh $@
 
-cpp-test: cpp
+cpp-test: install
 	@$(TOP)/execute.sh $@
 
-install: cpp java cpp-test
+install: cpp java
 	@$(TOP)/execute.sh $@
 
 build-rpms: install
 	@$(TOP)/execute.sh $@
 
-basic-search-test: build-rpms
+basic-search-test: build-rpms cpp-test java-test
 	@$(TOP)/execute.sh $@
 
 build-container: build-rpms
@@ -83,10 +86,10 @@ quick-start-guide: build-container
 publish-container: build-container
 	@$(TOP)/execute.sh $@
 
-publish-artifacts: java build-rpms
+publish-artifacts: build-rpms
 	@$(TOP)/execute.sh $@
 
-upload-test-results: java cpp-test
+upload-test-results: java-test cpp-test
 	@$(TOP)/execute.sh $@
 
 .PHONY: \
@@ -96,6 +99,7 @@ upload-test-results: java cpp-test
 	bootstrap \
 	bootstrap-cmake \
 	java \
+	java-test \
 	cpp \
 	cpp-test \
 	install \

.buildkite/java-test.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+#
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#
+# Tests Java components using Maven.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+if [[ -n "${DEBUG:-}" ]]; then
+    set -o xtrace
+fi
+
+mydir=${0%/*}
+shlim=${mydir}/show-limits.sh
+if [ -x "${shlim}" ]; then
+    "${shlim}" || echo "failed: ${shlim}"
+fi
+
+echo "--- ☕ Testing Java components"
+# shellcheck disable=1091
+source /etc/profile.d/enable-gcc-toolset.sh
+
+PATH=/opt/vespa-deps/bin:$PATH
+
+cd "$SOURCE_DIR"
+
+echo "Running Maven build with target: verify [threads: ${NUM_MVN_THREADS} opts: ${MAVEN_OPTS:-none} extra-opts: ${VESPA_MAVEN_EXTRA_OPTS:-none}]"
+read -ra MVN_EXTRA_OPTS <<< "$VESPA_MAVEN_EXTRA_OPTS"
+./mvnw -T "$NUM_MVN_THREADS" "${MVN_EXTRA_OPTS[@]}" verify

.buildkite/java.sh

@@ -28,4 +28,4 @@ cd "$SOURCE_DIR"
 
 echo "Running Maven build with target: ${VESPA_MAVEN_TARGET} [threads: ${NUM_MVN_THREADS} opts: ${MAVEN_OPTS:-none} extra-opts: ${VESPA_MAVEN_EXTRA_OPTS:-none}]"
 read -ra MVN_EXTRA_OPTS <<< "$VESPA_MAVEN_EXTRA_OPTS"
-./mvnw -T "$NUM_MVN_THREADS" "${MVN_EXTRA_OPTS[@]}" "$VESPA_MAVEN_TARGET"
+./mvnw -T "$NUM_MVN_THREADS" "${MVN_EXTRA_OPTS[@]}" -DskipTests "$VESPA_MAVEN_TARGET"