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

ci: use quay.io for ceph image #4738

Merged
merged 1 commit into from
Jul 30, 2024
Merged

ci: use quay.io for ceph image #4738

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
2 changes: 1 addition & 1 deletion containerized-tests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ node('cico-workspace') {
).trim()
def q_io_regex = ~"^quay.io/"

// base_image is like ceph/ceph:v15 or quay.io/ceph/ceph:v15, strip "quay.io/"
// base_image is like quay.io/ceph/ceph:v19, strip "quay.io/"
podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
}
}
Expand Down
6 changes: 3 additions & 3 deletions k8s-e2e-external-storage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ node('cico-workspace') {
podman_login(ci_registry, '$CREDS_USER', '$CREDS_PASSWD')
}

// base_image is like ceph/ceph:v15 or quay.io/ceph/ceph:v15, strip "quay.io/"
// base_image is like quay.io/ceph/ceph:v19, strip "quay.io/"
podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
// cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
Expand All @@ -163,11 +163,11 @@ node('cico-workspace') {
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/"
def q_io_regex = ~"^quay.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)
podman_pull(ci_registry, "docker.io", rook_ceph_cluster_image - q_io_regex)
}

timeout(time: 30, unit: 'MINUTES') {
Expand Down
6 changes: 3 additions & 3 deletions mini-e2e-helm.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ node('cico-workspace') {
podman_login(ci_registry, '$CREDS_USER', '$CREDS_PASSWD')
}

// base_image is like ceph/ceph:v15 or quay.io/ceph/ceph:v15, strip "quay.io/"
// base_image is like quay.io/ceph/ceph:v19, strip "quay.io/"
podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
// cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
Expand All @@ -167,11 +167,11 @@ node('cico-workspace') {
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/"
def q_io_regex = ~"^quay.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)
podman_pull(ci_registry, "quay.io", rook_ceph_cluster_image - q_io_regex)
}

timeout(time: 30, unit: 'MINUTES') {
Expand Down
6 changes: 3 additions & 3 deletions mini-e2e.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ node('cico-workspace') {
podman_login(ci_registry, '$CREDS_USER', '$CREDS_PASSWD')
}

// base_image is like ceph/ceph:v15 or docker.io/ceph/ceph:v15, strip "docker.io/"
// base_image is like quay.io/ceph/ceph:v19, strip "quay.io/"
podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
// cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
Expand All @@ -164,11 +164,11 @@ node('cico-workspace') {
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/"
def q_io_regex = ~"^quay.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)
podman_pull(ci_registry, "quay.io", rook_ceph_cluster_image - q_io_regex)
}

timeout(time: 30, unit: 'MINUTES') {
Expand Down
10 changes: 5 additions & 5 deletions upgrade-tests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ node('cico-workspace') {
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 ${BASE_IMAGE}\'',
returnStdout: true
).trim()
def d_io_regex = ~"^docker.io/"
def q_io_regex = ~"^quay.io/"

withCredentials([usernamePassword(credentialsId: 'container-registry-auth', usernameVariable: 'CREDS_USER', passwordVariable: 'CREDS_PASSWD')]) {
podman_login(ci_registry, '$CREDS_USER', '$CREDS_PASSWD')
}

// base_image is like ceph/ceph:v15 or docker.io/ceph/ceph:v15, strip "docker.io/"
podman_pull(ci_registry, "docker.io", "${base_image}" - d_io_regex)
// base_image is like quay.io/ceph/ceph:v19, strip "quay.io/"
podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
// cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
}
Expand All @@ -164,11 +164,11 @@ node('cico-workspace') {
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/"
def q_io_regex = ~"^quay.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)
podman_pull(ci_registry, "quay.io", rook_ceph_cluster_image - q_io_regex)
}

timeout(time: 30, unit: 'MINUTES') {
Expand Down