aboutsummaryrefslogtreecommitdiffstats
path: root/screwdriver.yaml
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@verizonmedia.com>2021-10-18 16:49:16 +0200
committerArnstein Ressem <aressem@verizonmedia.com>2021-10-18 16:49:16 +0200
commitf4f3c0f8b8117f0aeec5d4774880b534a2d14476 (patch)
treef40b8a84d87b2f4fb17b28106d95faf20c621ce1 /screwdriver.yaml
parent49a103973452a4a21f6e9302dcedfe0f03390626 (diff)
Bulid image based on published base.
Diffstat (limited to 'screwdriver.yaml')
-rw-r--r--screwdriver.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml
index 117249bac7c..e5180c4d435 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -50,7 +50,7 @@ shared:
jobs:
build-vespa:
- requires: [~pr]
+ #requires: [~pr]
annotations:
screwdriver.cd/cpu: 7
screwdriver.cd/ram: 16
@@ -83,6 +83,7 @@ jobs:
df -h
component-build:
+ requires: [~pr]
annotations:
screwdriver.cd/cpu: 7
screwdriver.cd/ram: 16
@@ -106,6 +107,10 @@ jobs:
VESPA_REF=$(meta get vespa.ref)
SYSTEM_TEST_REF=$(meta get system-test.ref)
+ VESPA_VERSION=7.485.3
+ VESPA_REF=c94e21087778f47afe90d277ef95d01956e74dfc
+ SYSTEM_TEST_REF=0df46b34f600a3eb899a090f779cd8f14520503e
+
if [[ $VESPA_VERSION == null ]] || [[ $VESPA_REF == null ]] || [[ $SYSTEM_TEST_REF == null ]]; then
echo "Must have valid Vespa version and reference to continue \
(got VESPA_VERSION=$VESPA_VERSION, VESPA_REF=$VESPA_REF, SYSTEM_TEST_REF=$SYSTEM_TEST_REF)."
@@ -161,7 +166,7 @@ jobs:
cp -a $LOCAL_MVN_REPO docker/repository
cd docker
docker build --file Dockerfile.multistage \
- --build-arg BASE_IMAGE=centos:7 --build-arg VESPA_BASE_IMAGE=base \
+ --build-arg BASE_IMAGE=notused --build-arg VESPA_BASE_IMAGE=vespaengine/vespa-systemtest-base-centos7:latest \
--build-arg SYSTEMTEST_BASE_IMAGE=vespa --build-arg SKIP_M2_POPULATE=true \
--target systemtest \
--tag vespaengine/vespa-systemtest-centos7:$VESPA_VERSION \