Merge branch 'master' into interns/magnus/servicesxml

.buildkite/Makefile

@@ -1,3 +1,4 @@
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 export TOP := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 
 export ARCH ?= $(shell if [[ $$(arch) == x86_64 ]]; then echo amd64; else echo arm64; fi)

.buildkite/basic-search-test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/bootstrap-cmake.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
+# shellcheck disable=1091
 source /etc/profile.d/enable-gcc-toolset.sh
 
 VESPA_CMAKE_SANITIZERS_OPTION=""

.buildkite/bootstrap.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/build-container.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/build-rpms.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/cpp-test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/cpp.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
+# shellcheck disable=1091
 source /etc/profile.d/enable-gcc-toolset.sh
 
 cd "$SOURCE_DIR"

.buildkite/execute.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
@@ -7,7 +8,7 @@ if [[ $# != 1 ]]; then
   exit 1
 fi
 
-readonly MYDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd )"
+MYDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd )"
 readonly STEP=$1
 readonly VERBOSE=${VERBOSE:-}
 

.buildkite/go.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/install.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/java.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
+# shellcheck disable=1091
 source /etc/profile.d/enable-gcc-toolset.sh
 
 cd "$SOURCE_DIR"

.buildkite/plugins/factory-reporter/README.md

@@ -1,4 +1,5 @@
 # Factory Reporter Buildkite Plugin
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 Reports a build to Vespa Factory
 

.buildkite/plugins/factory-reporter/hooks/pre-command

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/plugins/factory-reporter/hooks/pre-exit

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -eo pipefail
 

.buildkite/plugins/factory-reporter/plugin.yml

@@ -1,3 +1,4 @@
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 name: Factory Reporter
 description: Reports build pipeline status to Vespa Factory
 author: https://github.com/vespa-engine

.buildkite/prepare.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
-"$SOURCE_DIR/screwdriver/replace-vespa-version-in-poms.sh" "$VESPA_VERSION" "$SOURCE_DIR"
+"$SOURCE_DIR/.buildkite/replace-vespa-version-in-poms.sh" "$VESPA_VERSION" "$SOURCE_DIR"
 
 # We disable javadoc for all modules not marked as public API
 for MODULE in $(comm -2 -3 \

.buildkite/publish-artifacts.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/publish-container.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 

.buildkite/quick-start-guide.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
@@ -7,4 +8,4 @@ if [[ $VESPA_USE_SANITIZER != null ]]; then
     exit 0
 fi
 
-"$SOURCE_DIR/screwdriver/test-quick-start-guide.sh"
+"$SOURCE_DIR/.buildkite/test-quick-start-guide.sh"

screwdriver/release-ann-benchmark.sh → .buildkite/release-ann-benchmark.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/ssh-agent /bin/bash
+# shellcheck shell=bash disable=SC1008
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
@@ -16,16 +17,17 @@ if [[ -z "$ANN_BENCHMARK_DEPLOY_TOKEN" ]]; then
 fi
 
 BUILD_DIR=$(mktemp -d)
+# shellcheck disable=2064
 trap "rm -rf $BUILD_DIR" EXIT
-cd $BUILD_DIR
+cd "$BUILD_DIR"
 
 ssh-add -D
-ssh-add <(echo $ANN_BENCHMARK_DEPLOY_TOKEN | base64 -d)
+ssh-add <(echo "$ANN_BENCHMARK_DEPLOY_TOKEN" | base64 -d)
 git clone [email protected]:vespa-engine/vespa-ann-benchmark
 cd vespa-ann-benchmark
 
 RELEASE_TAG="v$VESPA_VERSION"
-if ! git rev-parse $RELEASE_TAG &> /dev/null; then
+if ! git rev-parse "$RELEASE_TAG" &> /dev/null; then
     git tag -a "$RELEASE_TAG" -m "Release version $VESPA_VERSION"
     git push origin "$RELEASE_TAG"
 fi

screwdriver/release-container-image-crane.sh → .buildkite/release-container-image-crane.sh

@@ -9,7 +9,7 @@ if [[ $# -ne 1 ]]; then
 fi
 
 readonly VESPA_VERSION=$1
-readonly VESPA_MAJOR=$(echo $VESPA_VERSION | cut -d. -f1)
+VESPA_MAJOR=$(echo "$VESPA_VERSION" | cut -d. -f1)
 
 if [[ -z "$DOCKER_HUB_DEPLOY_TOKEN" ]]; then
     echo "Environment variable DOCKER_HUB_DEPLOY_TOKEN must be set, but is empty."
@@ -20,33 +20,33 @@ if [[ -z "$GHCR_DEPLOY_TOKEN" ]]; then
     exit 1
 fi
 
-crane auth login -u aressem -p $GHCR_DEPLOY_TOKEN ghcr.io
-SRC_IMAGE=ghcr.io/vespa-engine/vespa-preview:$VESPA_VERSION
-SRC_IMAGE_DIGEST=$(crane digest $SRC_IMAGE)
+crane auth login -u aressem -p "$GHCR_DEPLOY_TOKEN" ghcr.io
+SRC_IMAGE="ghcr.io/vespa-engine/vespa-preview:$VESPA_VERSION"
+SRC_IMAGE_DIGEST=$(crane digest "$SRC_IMAGE")
 cosign verify \
     --certificate-identity https://buildkite.com/vespaai/vespa-engine-vespa \
     --certificate-oidc-issuer https://agent.buildkite.com \
-    $SRC_IMAGE@$SRC_IMAGE_DIGEST
+    "$SRC_IMAGE@$SRC_IMAGE_DIGEST"
 
 # Copy to Docker Hub
-if curl -fsSL https://hub.docker.com/v2/repositories/vespaengine/vespa/tags/$VESPA_VERSION &> /dev/null; then
+if curl -fsSL "https://hub.docker.com/v2/repositories/vespaengine/vespa/tags/$VESPA_VERSION" &> /dev/null; then
     echo "Container image docker.io/vespaengine/vespa:$VESPA_VERSION already exists."
 else
-  DST_IMAGE=docker.io/vespaengine/vespa:$VESPA_VERSION
-  crane auth login -u aressem -p $DOCKER_HUB_DEPLOY_TOKEN docker.io
-  crane cp $SRC_IMAGE@$SRC_IMAGE_DIGEST $DST_IMAGE
-  crane tag $DST_IMAGE $VESPA_MAJOR
-  crane tag $DST_IMAGE latest
+  DST_IMAGE="docker.io/vespaengine/vespa:$VESPA_VERSION"
+  crane auth login -u aressem -p "$DOCKER_HUB_DEPLOY_TOKEN" docker.io
+  crane cp "$SRC_IMAGE@$SRC_IMAGE_DIGEST" "$DST_IMAGE"
+  crane tag "$DST_IMAGE" "$VESPA_MAJOR"
+  crane tag "$DST_IMAGE" latest
 fi
 
 # Copy to GitHub Container Registry
-JWT=$(curl -sSL -u aressem:$GHCR_DEPLOY_TOKEN "https://ghcr.io/token?service=ghcr.io&scope=repository:vespa-engine/vespa:pull" | jq -re '.token')
+JWT=$(curl -sSL -u "aressem:$GHCR_DEPLOY_TOKEN" "https://ghcr.io/token?service=ghcr.io&scope=repository:vespa-engine/vespa:pull" | jq -re '.token')
 IMAGE_TAGS=$(curl -sSL -H "Authorization: Bearer $JWT" https://ghcr.io/v2/vespa-engine/vespa/tags/list | jq -re '.tags[]')
-if grep $VESPA_VERSION <<< "$IMAGE_TAGS" &> /dev/null; then
+if grep "$VESPA_VERSION" <<< "$IMAGE_TAGS" &> /dev/null; then
     echo "Container image ghcr.io/vespa-engine/vespa:$VESPA_VERSION already exists."
 else
-  DST_IMAGE=ghcr.io/vespa-engine/vespa:$VESPA_VERSION
-  crane cp $SRC_IMAGE@$SRC_IMAGE_DIGEST $DST_IMAGE
-  crane tag $DST_IMAGE $VESPA_MAJOR
-  crane tag $DST_IMAGE latest
+  DST_IMAGE="ghcr.io/vespa-engine/vespa:$VESPA_VERSION"
+  crane cp "$SRC_IMAGE@$SRC_IMAGE_DIGEST" "$DST_IMAGE"
+  crane tag "$DST_IMAGE" "$VESPA_MAJOR"
+  crane tag "$DST_IMAGE" latest
 fi

screwdriver/release-generic-container-image.sh → .buildkite/release-generic-container-image.sh

@@ -11,30 +11,31 @@ fi
 readonly VESPA_VERSION=$1
 readonly IMAGE_NAME="vespaengine/vespa-generic-intel-x86_64"
 
-if curl -fsSL https://hub.docker.com/v2/repositories/$IMAGE_NAME/tags/$VESPA_VERSION/ &> /dev/null; then
+if curl -fsSL "https://hub.docker.com/v2/repositories/$IMAGE_NAME/tags/$VESPA_VERSION/" &> /dev/null; then
   echo "Container image docker.io/$IMAGE_NAME:$VESPA_VERSION aldready exists."
   exit 0
 fi
 
 TMPDIR=$(mktemp -d)
+# shellcheck disable=2064
 trap "rm -rf $TMPDIR" EXIT
 
-pushd $TMPDIR
+pushd "$TMPDIR"
 git clone -q --filter tree:0 https://github.com/vespa-engine/vespa
-(cd vespa && git checkout v$VESPA_VERSION)
-(cd vespa && screwdriver/replace-vespa-version-in-poms.sh $VESPA_VERSION $(pwd) )
+(cd vespa && git checkout "v$VESPA_VERSION")
+(cd vespa && .buildkite/replace-vespa-version-in-poms.sh "$VESPA_VERSION" "$(pwd)" )
 
-make -C vespa -f .copr/Makefile srpm outdir=$(pwd)
+make -C vespa -f .copr/Makefile srpm outdir="$(pwd)"
 
 rpmbuild --rebuild \
   --define="_topdir $TMPDIR/vespa-rpmbuild" \
   --define "debug_package %{nil}" \
   --define "_debugsource_template %{nil}" \
   --define '_cmake_extra_opts "-DDEFAULT_VESPA_CPU_ARCH_FLAGS=-msse3 -mcx16 -mtune=intel"' \
-  *.src.rpm
+  ./*.src.rpm
 
-rm -f *.src.rpm
-mv $TMPDIR/vespa-rpmbuild/RPMS/*/*.rpm .
+rm -f ./*.src.rpm
+mv "$TMPDIR"/vespa-rpmbuild/RPMS/*/*.rpm .
 
 cat <<EOF > Dockerfile
 ARG VESPA_VERSION
@@ -46,18 +47,18 @@ EOF
 
 
 docker build --progress plain \
-  --build-arg VESPA_VERSION=$VESPA_VERSION \
-  --tag docker.io/$IMAGE_NAME:$VESPA_VERSION \
-  --tag docker.io/$IMAGE_NAME:latest \
+  --build-arg VESPA_VERSION="$VESPA_VERSION" \
+  --tag "docker.io/$IMAGE_NAME:$VESPA_VERSION" \
+  --tag "docker.io/$IMAGE_NAME:latest" \
   --tag vespaengine/vespa:latest \
   --file Dockerfile .
 
-vespa/screwdriver/test-quick-start-guide.sh
+vespa/.buildkite/test-quick-start-guide.sh
 
 OPT_STATE="$(set +o)"
 set +x
 docker login --username aressem --password "$DOCKER_HUB_DEPLOY_TOKEN"
 eval "$OPT_STATE"
-docker push docker.io/$IMAGE_NAME:$VESPA_VERSION
-docker push docker.io/$IMAGE_NAME:latest
+docker push "docker.io/$IMAGE_NAME:$VESPA_VERSION"
+docker push "docker.io/$IMAGE_NAME:latest"