summaryrefslogtreecommitdiffstats
path: root/screwdriver.yaml
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@yahooinc.com>2023-06-05 11:46:16 +0200
committerArnstein Ressem <aressem@yahooinc.com>2023-06-05 11:46:16 +0200
commit55bd940eea312ebdd9078a6e6bbc2cc45191a165 (patch)
treef2b6c10d8d8493a3c28f17f248ae4cb8a7c46e7b /screwdriver.yaml
parenta2591e7ff1534f4bb83b7d27dcbf602cec19eaf0 (diff)
Fix image testing after revert to docker.
Diffstat (limited to 'screwdriver.yaml')
-rw-r--r--screwdriver.yaml10
1 files changed, 3 insertions, 7 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml
index 783777c0b51..718b0fdcd4c 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -341,6 +341,7 @@ jobs:
fi
publish-el9-preview:
+ requires: [~pr]
image: docker.io/vespaengine/vespa-build-centos-stream8:latest
annotations:
screwdriver.cd/cpu: 7
@@ -381,21 +382,16 @@ jobs:
docker context use vespa-context
docker buildx create --name vespa-builder --driver docker-container --use
docker buildx inspect --bootstrap
- docker login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY"
docker buildx build \
--progress plain \
--load \
- --platform linux/amd64,linux/arm64 \
+ --platform linux/amd64 \
--build-arg VESPA_BASE_IMAGE=el9 \
--build-arg VESPA_VERSION=$VESPA_VERSION \
--file Dockerfile \
- --tag docker.io/vespaengine/$IMAGE_NAME:$VESPA_VERSION \
- --tag docker.io/vespaengine/$IMAGE_NAME:$VESPA_MAJOR \
- --tag docker.io/vespaengine/$IMAGE_NAME:latest \
+ --tag vespaengine/$IMAGE_NAME:latest \
.
- verify-container-image: |
- # Trick to be able to use the documentation testing to verify the image built locally
- buildah tag $IMAGE_NAME:$VESPA_VERSION vespaengine/vespa:latest
# Run quick start guide
$SD_SOURCE_DIR/screwdriver/test-quick-start-guide.sh
- publish-image: |