Separate out quick start guide test and use the same both for regular and legacy image.

3 files changed, 32 insertions, 11 deletions

diff --git a/screwdriver.yaml b/screwdriver.yaml
index 16f4c9ac9f4..c9de232d893 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -296,17 +296,8 @@ jobs:
       - verify-container-image: |
           # Trick to be able to use the documentation testing to verify the image built locally
           buildah tag docker.io/$IMAGE_NAME:$VESPA_VERSION vespaengine/vespa:latest
-          # Clone and setup doc tests
-          git clone -q --depth 1 https://github.com/vespa-engine/documentation
-          cd documentation
-          python3 -m pip install -qqq -r test/requirements.txt --user
-          echo -e "urls:\n    - en/vespa-quick-start.html" > test/_quick-start.yaml
-          # Get the required vespa CLI
-          VESPA_CLI_VERSION=$(curl -fsSL https://api.github.com/repos/vespa-engine/vespa/releases/latest | grep -Po '"tag_name": "v\K.*?(?=")') && \
-          curl -fsSL https://github.com/vespa-engine/vespa/releases/download/v${VESPA_CLI_VERSION}/vespa-cli_${VESPA_CLI_VERSION}_linux_amd64.tar.gz | tar -zxf - -C /opt && \
-          ln -sf /opt/vespa-cli_${VESPA_CLI_VERSION}_linux_amd64/bin/vespa /usr/local/bin/
-          # Run test
-          test/test.py -c test/_quick-start.yaml
+          # Run quick start guide
+          $SD_SOURCE_DIR/screwdriver/test-quick-start-guide.sh
       - publish-test-image: |
           if [[ -z $SD_PULL_REQUEST ]]; then
             if curl -fsSL https://index.docker.io/v1/repositories/$IMAGE_NAME/tags/$VESPA_VERSION &> /dev/null; then
diff --git a/screwdriver/release-container-image.sh b/screwdriver/release-container-image.sh
index 6d8babe3dcc..a2a56313fb5 100755
--- a/screwdriver/release-container-image.sh
+++ b/screwdriver/release-container-image.sh
@@ -61,6 +61,11 @@ for data in "Dockerfile vespa"; do
     if curl -fsSL https://index.docker.io/v1/repositories/vespaengine/$IMAGE_NAME/tags/$VESPA_VERSION &> /dev/null; then
         echo "Container image docker.io/vespaengine/$IMAGE_NAME:$VESPA_VERSION aldready exists."
     else
+        # Build the image and run through the quick start guide
+        docker buildx build --progress plain --load --platform linux/amd64 --build-arg VESPA_VERSION=$VESPA_VERSION \
+               --file $DOCKER_FILE --tag vespaengine/$IMAGE_NAME:latest .
+        $SD_SOURCE_DIR/screwdriver/test-quick-start-guide.sh
+
         docker login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY"
         docker buildx build --progress plain --push --platform linux/amd64,linux/arm64 --build-arg VESPA_VERSION=$VESPA_VERSION \
                --file $DOCKER_FILE --tag docker.io/vespaengine/$IMAGE_NAME:$VESPA_VERSION \
diff --git a/screwdriver/test-quick-start-guide.sh b/screwdriver/test-quick-start-guide.sh
new file mode 100755
index 00000000000..f3f12c229b0
--- /dev/null
+++ b/screwdriver/test-quick-start-guide.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# 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.
+set -xeuo pipefail
+
+TESTDIR=$(mktemp -d)
+trap "rm -rf $TESTDIR" EXIT
+
+cd $TESTDIR
+
+# Clone and setup doc tests
+git clone -q --depth 1 https://github.com/vespa-engine/documentation
+cd documentation
+python3 -m pip install -qqq -r test/requirements.txt --user
+echo -e "urls:\n    - en/vespa-quick-start.html" > test/_quick-start.yaml
+
+# Get the required vespa CLI
+VESPA_CLI_VERSION=$(curl -fsSL https://api.github.com/repos/vespa-engine/vespa/releases/latest | grep -Po '"tag_name": "v\K.*?(?=")')
+curl -fsSL https://github.com/vespa-engine/vespa/releases/download/v${VESPA_CLI_VERSION}/vespa-cli_${VESPA_CLI_VERSION}_linux_amd64.tar.gz | tar -zxf - -C /opt
+ln -sf /opt/vespa-cli_${VESPA_CLI_VERSION}_linux_amd64/bin/vespa /usr/local/bin/
+
+# Run test
+test/test.py -v -c test/_quick-start.yaml
+