Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: pre-pull ROOK_CEPH_CLUSTER_IMAGE if set #1903

Merged
merged 1 commit into from
Mar 3, 2021
Merged

ci: pre-pull ROOK_CEPH_CLUSTER_IMAGE if set #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions mini-e2e-helm.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,17 @@ node('cico-workspace') {
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') {
ssh "./single-node-k8s.sh --k8s-version=${k8s_release}"
}
Expand Down
11 changes: 11 additions & 0 deletions mini-e2e.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,17 @@ node('cico-workspace') {
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') {
ssh "./single-node-k8s.sh --k8s-version=${k8s_release}"
}
Expand Down
6 changes: 6 additions & 0 deletions single-node-k8s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ then
./podman2minikube.sh "${BASE_IMAGE}"
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

# running e2e.test requires librados and librbd
Expand Down