ci: use docker.io/library/ as prefix for nginx and vault images

docker.io/nginx:latest and docker.io/vault:latest are being redirected
to docker.io/library/. The redirection is not cached, and Docker Hub
might return an error during redirection when the pull rate-limit is
hit.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-11-26 13:01:09 +01:00 committed by mergify[bot]
parent 7384683af2
commit 005d201f2f
3 changed files with 12 additions and 27 deletions

View File

@ -144,15 +144,10 @@ node('cico-workspace') {
}
// vault:latest and nginx:latest are used by the e2e tests
// Tag the images with qualified and unqualified names,
// so that moving to qualified names everywhere becomes
// possible.
podman_pull("docker.io", "vault:latest")
ssh "./podman2minikube.sh vault:latest"
ssh "./podman2minikube.sh docker.io/vault:latest"
podman_pull("docker.io", "nginx:latest")
ssh "./podman2minikube.sh nginx:latest"
ssh "./podman2minikube.sh docker.io/nginx:latest"
podman_pull("docker.io", "library/vault:latest")
ssh "./podman2minikube.sh docker.io/library/vault:latest"
podman_pull("docker.io", "library/nginx:latest")
ssh "./podman2minikube.sh docker.io/library/nginx:latest"
}
stage('deploy ceph-csi through helm') {
timeout(time: 30, unit: 'MINUTES') {

View File

@ -141,15 +141,10 @@ node('cico-workspace') {
}
// vault:latest and nginx:latest are used by the e2e tests
// Tag the images with qualified and unqualified names,
// so that moving to qualified names everywhere becomes
// possible.
podman_pull("docker.io", "vault:latest")
ssh "./podman2minikube.sh vault:latest"
ssh "./podman2minikube.sh docker.io/vault:latest"
podman_pull("docker.io", "nginx:latest")
ssh "./podman2minikube.sh nginx:latest"
ssh "./podman2minikube.sh docker.io/nginx:latest"
podman_pull("docker.io", "library/vault:latest")
ssh "./podman2minikube.sh docker.io/library/vault:latest"
podman_pull("docker.io", "library/nginx:latest")
ssh "./podman2minikube.sh docker.io/library/nginx:latest"
}
stage('run e2e') {
timeout(time: 120, unit: 'MINUTES') {

View File

@ -141,15 +141,10 @@ node('cico-workspace') {
}
// vault:latest and nginx:latest are used by the e2e tests
// Tag the images with qualified and unqualified names,
// so that moving to qualified names everywhere becomes
// possible.
podman_pull("docker.io", "vault:latest")
ssh "./podman2minikube.sh vault:latest"
ssh "./podman2minikube.sh docker.io/vault:latest"
podman_pull("docker.io", "nginx:latest")
ssh "./podman2minikube.sh nginx:latest"
ssh "./podman2minikube.sh docker.io/nginx:latest"
podman_pull("docker.io", "library/vault:latest")
ssh "./podman2minikube.sh docker.io/library/vault:latest"
podman_pull("docker.io", "library/nginx:latest")
ssh "./podman2minikube.sh docker.io/library/nginx:latest"
}
stage("run ${test_type} upgrade tests") {
timeout(time: 120, unit: 'MINUTES') {