diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-10-21 17:22:32 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@verizonmedia.com> | 2021-10-21 17:22:32 +0200 |
| commit | 466340ff58804a5f6fe222e0640427484c4f1b70 (patch) | |
| tree | dc97ec8523099b4640009be5882b776fc9ff14ca /screwdriver.yaml | |
| parent | 498417e4fe916bc3bb9fbcae3f1dd3f0e72f56b2 (diff) | |
Use new Dockerfile.systemtest to avoid executing the base step once more.
Diffstat (limited to 'screwdriver.yaml')
| -rw-r--r-- | screwdriver.yaml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index 5cae2a8842c..e750d6448ef 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,7 +83,6 @@ jobs: df -h component-build: - requires: [~pr] annotations: screwdriver.cd/cpu: 7 screwdriver.cd/ram: 16 @@ -107,10 +106,6 @@ 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)." @@ -165,8 +160,8 @@ jobs: git archive HEAD --format tar | tar x -C docker/vespa-systemtests 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=vespaengine/vespa-systemtest-base-centos7:latest \ + docker build --file Dockerfile.systemtest \ + --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 \ |