mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 16:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: pre-pull ROOK_CEPH_CLUSTER_IMAGE if set

Browse Source 
After the introduction of ROOK_CEPH_CLUSTER_IMAGE in build.env, the
additional image needs to get pulled from the CI registry mirror and
pushed into the minikube VM.

Without this addition, the Docker Hub pull limits may prevent deploying
Rook.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-03-03 11:46:52 +01:00 committed by mergify[bot]
parent 415abead1e
commit 69cb6aeead
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mini-e2e-helm.groovy
View File

@ -144,6 +144,17 @@ node('cico-workspace') {
podman_pull(ci_registry, "docker.io", "rook/ceph:${rook_version}") podman_pull(ci_registry, "docker.io", "rook/ceph:${rook_version}")
} }
def rook_ceph_cluster_image = sh(
script: 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${CICO_NODE} \'source /opt/build/go/src/github.com/ceph/ceph-csi/build.env && echo ${ROOK_CEPH_CLUSTER_IMAGE}\'',
returnStdout: true
).trim()
def d_io_regex = ~"^docker.io/"
if (rook_ceph_cluster_image != '') {
// single-node-k8s.sh pushes the image into minikube
podman_pull(ci_registry, "docker.io", rook_ceph_cluster_image - d_io_regex)
}
timeout(time: 30, unit: 'MINUTES') { timeout(time: 30, unit: 'MINUTES') {
ssh "./single-node-k8s.sh --k8s-version=${k8s_release}" ssh "./single-node-k8s.sh --k8s-version=${k8s_release}"
} }

11
mini-e2e.groovy
View File

@ -141,6 +141,17 @@ node('cico-workspace') {
podman_pull(ci_registry, "docker.io", "rook/ceph:${rook_version}") podman_pull(ci_registry, "docker.io", "rook/ceph:${rook_version}")
} }
def rook_ceph_cluster_image = sh(
script: 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${CICO_NODE} \'source /opt/build/go/src/github.com/ceph/ceph-csi/build.env && echo ${ROOK_CEPH_CLUSTER_IMAGE}\'',
returnStdout: true
).trim()
def d_io_regex = ~"^docker.io/"
if (rook_ceph_cluster_image != '') {
// single-node-k8s.sh pushes the image into minikube
podman_pull(ci_registry, "docker.io", rook_ceph_cluster_image - d_io_regex)
}
timeout(time: 30, unit: 'MINUTES') { timeout(time: 30, unit: 'MINUTES') {
ssh "./single-node-k8s.sh --k8s-version=${k8s_release}" ssh "./single-node-k8s.sh --k8s-version=${k8s_release}"
} }

6
single-node-k8s.sh
View File

@ -142,6 +142,12 @@ then
./podman2minikube.sh "${BASE_IMAGE}" ./podman2minikube.sh "${BASE_IMAGE}"
fi fi
# Rook also uses ceph/ceph:v15 (build.env:ROOK_CEPH_CLUSTER_IMAGE), so push it into the VM
if [ -n "${ROOK_CEPH_CLUSTER_IMAGE}" ] && podman inspect "${ROOK_CEPH_CLUSTER_IMAGE}" > /dev/null
then
./podman2minikube.sh "${ROOK_CEPH_CLUSTER_IMAGE}"
fi
deploy_rook deploy_rook
# running e2e.test requires librados and librbd # running e2e.test requires librados and librbd