diff options
author | Arnstein Ressem <aressem@yahooinc.com> | 2023-11-14 10:00:28 +0100 |
---|---|---|
committer | Arnstein Ressem <aressem@yahooinc.com> | 2023-11-14 10:00:28 +0100 |
commit | 7318f0740dad969ac918af79938e13fbfdb3d6e7 (patch) | |
tree | 3683a23d82435ad0f77c71407e3f8ff32497fa23 | |
parent | 29109450c8c2c98d969a711b8f6240bb5594c150 (diff) |
Transition to AlmaLinux
-rw-r--r-- | screwdriver.yaml | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index dd9fa5cba8b..5db34f0e2da 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -6,7 +6,7 @@ cache: component-build: [/main_job_cache] shared: - image: vespaengine/vespa-build-centos-stream8:latest + image: docker.io/vespaengine/vespa-build-almalinux-8 environment: USER_SHELL_BIN: bash annotations: @@ -199,13 +199,13 @@ jobs: fi docker build --file Dockerfile.systemtest \ --progress=plain \ - --build-arg VESPA_BASE_IMAGE=vespaengine/vespa-systemtest-base-centos-stream8:latest \ + --build-arg VESPA_BASE_IMAGE=vespaengine/vespa-systemtest-base:latest \ --build-arg SYSTEMTEST_BASE_IMAGE=vespa --build-arg SKIP_M2_POPULATE=$SKIP_M2_POPULATE \ --target systemtest \ - --tag vespaengine/vespa-systemtest-centos-stream8:$VESPA_VERSION \ - --tag vespaengine/vespa-systemtest-centos-stream8:latest . + --tag vespaengine/vespa-systemtest:$VESPA_VERSION \ + --tag vespaengine/vespa-systemtest:latest . - verify-test-image: | - docker run --rm -ti --entrypoint bash vespaengine/vespa-systemtest-centos-stream8:$VESPA_VERSION -lc \ + docker run --rm -ti --entrypoint bash vespaengine/vespa-systemtest:$VESPA_VERSION -lc \ "/opt/vespa-systemtests/lib/node_server.rb & sleep 3 && ruby /opt/vespa-systemtests/tests/search/basicsearch/basic_search.rb --run test_basicsearch__ELASTIC" - publish-test-image: | if [[ -z "$SD_PULL_REQUEST" ]]; then @@ -213,8 +213,8 @@ jobs: set +x docker login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY" eval "$OPT_STATE" - docker push docker.io/vespaengine/vespa-systemtest-centos-stream8:$VESPA_VERSION - docker push docker.io/vespaengine/vespa-systemtest-centos-stream8:latest + docker push docker.io/vespaengine/vespa-systemtest:$VESPA_VERSION + docker push docker.io/vespaengine/vespa-systemtest:latest fi - *save-cache - update-build-status: | @@ -233,8 +233,6 @@ jobs: fi publish-release: - image: docker.io/vespaengine/vespa-build-centos-stream8:latest - annotations: screwdriver.cd/cpu: 7 screwdriver.cd/ram: 16 @@ -294,8 +292,6 @@ jobs: screwdriver/factory-command.sh update-released-time $VESPA_VERSION publish-legacy-release: - image: docker.io/vespaengine/vespa-build-centos-stream8:latest - annotations: screwdriver.cd/cpu: 7 screwdriver.cd/ram: 16 @@ -374,7 +370,6 @@ jobs: fi publish-el9-preview: - image: docker.io/vespaengine/vespa-build-centos-stream8:latest annotations: screwdriver.cd/cpu: 7 screwdriver.cd/ram: 16 @@ -452,7 +447,6 @@ jobs: fi publish-el8-preview: - image: docker.io/vespaengine/vespa-build-centos-stream8:latest annotations: screwdriver.cd/cpu: 7 screwdriver.cd/ram: 16 @@ -517,7 +511,7 @@ jobs: fi verify-opensource-rpm-installable: - image: quay.io/centos/centos:stream8 + image: docker.io/almalinux:8 annotations: screwdriver.cd/buildPeriodically: H 0 * * * steps: @@ -529,7 +523,7 @@ jobs: dnf install -y vespa mirror-copr-rpms-to-archive: - image: quay.io/centos/centos:stream8 + image: docker.io/almalinux:8 annotations: screwdriver.cd/cpu: LOW screwdriver.cd/ram: LOW @@ -559,7 +553,7 @@ jobs: screwdriver/delete-old-cloudsmith-artifacts.sh mirror-copr-rpms-to-artifactory: - image: quay.io/centos/centos:stream8 + image: docker.io/almalinux:8 annotations: screwdriver.cd/cpu: LOW screwdriver.cd/ram: LOW |