From a07fb3bcfc7c36d951e1ae8fde8cfe80abe18ef6 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 19 Nov 2021 12:28:36 +0530 Subject: [PATCH] ci: update images for vault 1.8.5 updating ci scripts to pull the vault images from ci registry. Signed-off-by: Madhu Rajanna --- mini-e2e-helm.groovy | 4 +++- mini-e2e.groovy | 4 +++- mirror/images.txt | 1 + upgrade-tests.groovy | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mini-e2e-helm.groovy b/mini-e2e-helm.groovy index d10d25d70..820db25fd 100644 --- a/mini-e2e-helm.groovy +++ b/mini-e2e-helm.groovy @@ -162,11 +162,13 @@ node('cico-workspace') { ssh "./single-node-k8s.sh --k8s-version=${k8s_release}" } - // vault:latest and nginx:latest are used by the e2e tests + // vault:latest,1.8.5 and nginx:latest are used by the e2e tests podman_pull(ci_registry, "docker.io", "library/vault:latest") ssh "./podman2minikube.sh docker.io/library/vault:latest" podman_pull(ci_registry, "docker.io", "library/nginx:latest") ssh "./podman2minikube.sh docker.io/library/nginx:latest" + podman_pull(ci_registry, "docker.io", "library/vault:1.8.5") + ssh "./podman2minikube.sh docker.io/library/vault:1.8.5" } stage('deploy ceph-csi through helm') { timeout(time: 30, unit: 'MINUTES') { diff --git a/mini-e2e.groovy b/mini-e2e.groovy index b33ea2a9e..4193eb9ef 100644 --- a/mini-e2e.groovy +++ b/mini-e2e.groovy @@ -159,11 +159,13 @@ node('cico-workspace') { ssh "./single-node-k8s.sh --k8s-version=${k8s_release}" } - // vault:latest and nginx:latest are used by the e2e tests + // vault:latest,1.8.5 and nginx:latest are used by the e2e tests podman_pull(ci_registry, "docker.io", "library/vault:latest") ssh "./podman2minikube.sh docker.io/library/vault:latest" podman_pull(ci_registry, "docker.io", "library/nginx:latest") ssh "./podman2minikube.sh docker.io/library/nginx:latest" + podman_pull(ci_registry, "docker.io", "library/vault:1.8.5") + ssh "./podman2minikube.sh docker.io/library/vault:1.8.5" } stage('run e2e') { timeout(time: 120, unit: 'MINUTES') { diff --git a/mirror/images.txt b/mirror/images.txt index 6a104f30f..20ee41cec 100644 --- a/mirror/images.txt +++ b/mirror/images.txt @@ -18,3 +18,4 @@ docker.io/rook/ceph:v1.4.9 rook/ceph:v1.4.9 docker.io/library/busybox:1.29 library/busybox:1.29 docker.io/library/nginx:latest library/nginx:latest docker.io/library/vault:latest library/vault:latest +docker.io/library/vault:1.8.5 library/vault:1.8.5 diff --git a/upgrade-tests.groovy b/upgrade-tests.groovy index ee11f94f9..b04408e48 100644 --- a/upgrade-tests.groovy +++ b/upgrade-tests.groovy @@ -159,11 +159,13 @@ node('cico-workspace') { ssh "./single-node-k8s.sh --k8s-version=${k8s_release}" } - // vault:latest and nginx:latest are used by the e2e tests + // vault:latest,1.8.5 and nginx:latest are used by the e2e tests podman_pull(ci_registry, "docker.io", "library/vault:latest") ssh "./podman2minikube.sh docker.io/library/vault:latest" podman_pull(ci_registry, "docker.io", "library/nginx:latest") ssh "./podman2minikube.sh docker.io/library/nginx:latest" + podman_pull(ci_registry, "docker.io", "library/vault:1.8.5") + ssh "./podman2minikube.sh docker.io/library/vault:1.8.5" } stage("run ${test_type} upgrade tests") { timeout(time: 120, unit: 'MINUTES') {