15 files changed, 47 insertions, 13 deletions
diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh
index 1873d8e7878..72b26e1032e 100755
--- a/screwdriver/build-vespa.sh
+++ b/screwdriver/build-vespa.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -e
 
@@ -24,8 +24,7 @@ fi
 build_cpp() {
     cat /proc/cpuinfo | grep "model name" | head -1
     cat /proc/cpuinfo | grep "flags" | head -1
-    # TODO This will only build for x86_64 architecture, and is used for pull request builds.
-    cmake3 -DVESPA_UNPRIVILEGED=no -DDEFAULT_VESPA_CPU_ARCH_FLAGS="-march=skylake" $1
+    cmake3 -DVESPA_UNPRIVILEGED=no $1
     time make -j ${NUM_THREADS}
     time ctest3 --output-on-failure -j ${NUM_THREADS}
     ccache --show-stats
diff --git a/screwdriver/delete-old-artifactory-artifacts.sh b/screwdriver/delete-old-artifactory-artifacts.sh
index 3bb968f3995..3167f91accb 100755
--- a/screwdriver/delete-old-artifactory-artifacts.sh
+++ b/screwdriver/delete-old-artifactory-artifacts.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 
 set -euo pipefail
diff --git a/screwdriver/detect-what-to-build.sh b/screwdriver/detect-what-to-build.sh
index 9666f058942..c755a5cdc25 100755
--- a/screwdriver/detect-what-to-build.sh
+++ b/screwdriver/detect-what-to-build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 if (( ${#BASH_SOURCE[@]} == 1 )); then
     echo "This script must be sourced."
diff --git a/screwdriver/factory-command.sh b/screwdriver/factory-command.sh
index b938b36d8e8..3b739b9f5c9 100755
--- a/screwdriver/factory-command.sh
+++ b/screwdriver/factory-command.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 -eo pipefail
 
 if (( $# < 1 )); then
diff --git a/screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh b/screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh
index ceddc9fe30b..dd6f1b5f10f 100755
--- a/screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh
+++ b/screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/screwdriver/release-ann-benchmark.sh b/screwdriver/release-ann-benchmark.sh
new file mode 100755
index 00000000000..7ef7e4df68c
--- /dev/null
+++ b/screwdriver/release-ann-benchmark.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/ssh-agent /bin/bash
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+set -euo pipefail
+
+if [[ $# -ne 1 ]]; then
+    echo "Usage: $0 <Vespa version>"
+    exit 1
+fi
+
+readonly VESPA_VERSION=$1
+
+if [[ -z "$ANN_BENCHMARK_DEPLOY_KEY" ]]; then
+    echo "Environment variable ANN_BENCHMARK_DEPLOY_KEY must be set, but is empty."
+    exit 1
+fi
+
+BUILD_DIR=$(mktemp -d)
+trap "rm -rf $BUILD_DIR" EXIT
+cd $BUILD_DIR
+
+ssh-add -D
+ssh-add <(echo $ANN_BENCHMARK_DEPLOY_KEY | base64 -d)
+git clone git@github.com:vespa-engine/vespa-ann-benchmark
+cd vespa-ann-benchmark
+
+RELEASE_TAG="v$VESPA_VERSION"
+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
+
diff --git a/screwdriver/release-container-image-docker.sh b/screwdriver/release-container-image-docker.sh
index 46786bf8dc9..f2249c93dc0 100755
--- a/screwdriver/release-container-image-docker.sh
+++ b/screwdriver/release-container-image-docker.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/ssh-agent /bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/screwdriver/release-container-image.sh b/screwdriver/release-container-image.sh
index 33231890626..d67b389d52e 100755
--- a/screwdriver/release-container-image.sh
+++ b/screwdriver/release-container-image.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/ssh-agent /bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh
index cb892b86e80..e0107b36cf5 100755
--- a/screwdriver/release-java-artifacts.sh
+++ b/screwdriver/release-java-artifacts.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 
diff --git a/screwdriver/release-rpms.sh b/screwdriver/release-rpms.sh
index 09ea568ddd8..b3834572a4a 100755
--- a/screwdriver/release-rpms.sh
+++ b/screwdriver/release-rpms.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/ssh-agent /bin/bash 
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 set -x
diff --git a/screwdriver/replace-vespa-version-in-poms.sh b/screwdriver/replace-vespa-version-in-poms.sh
index 1f73c1ff933..d57f126aac9 100755
--- a/screwdriver/replace-vespa-version-in-poms.sh
+++ b/screwdriver/replace-vespa-version-in-poms.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
 
diff --git a/screwdriver/settings-publish.xml b/screwdriver/settings-publish.xml
index 04334590a55..791c19eca60 100644
--- a/screwdriver/settings-publish.xml
+++ b/screwdriver/settings-publish.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
     <servers>
diff --git a/screwdriver/test-quick-start-guide.sh b/screwdriver/test-quick-start-guide.sh
index de8c815edfa..eead39fecaa 100755
--- a/screwdriver/test-quick-start-guide.sh
+++ b/screwdriver/test-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.
 
 # This test will test the quick start guide that use the vespaengine/vespa:latest image. To test a locally
 # generated image, make sure that the image is tagged as vespaengine/vespa:latest.
diff --git a/screwdriver/update-vespa-version-in-sample-apps.sh b/screwdriver/update-vespa-version-in-sample-apps.sh
index d3870267f26..fdaed467086 100755
--- a/screwdriver/update-vespa-version-in-sample-apps.sh
+++ b/screwdriver/update-vespa-version-in-sample-apps.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/ssh-agent /bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail
 set -x
diff --git a/screwdriver/upload-rpm-to-artifactory.sh b/screwdriver/upload-rpm-to-artifactory.sh
index 0c679debb48..0da46355a96 100755
--- a/screwdriver/upload-rpm-to-artifactory.sh
+++ b/screwdriver/upload-rpm-to-artifactory.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 set -euo pipefail