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

ci: use quay.io for ceph image

Browse Source 
ceph image is using quay.io not
the docker.io, This commit updates
the same in CI.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2024-07-29 09:47:25 +02:00 committed by mergify[bot]
parent 96a8831e6c
commit 9466bc3542
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containerized-tests.groovy
View File

@ -155,7 +155,7 @@ node('cico-workspace') {
).trim() ).trim()
def q_io_regex = ~"^quay.io/" 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) podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
} }
} }

6
k8s-e2e-external-storage.groovy
View File

@ -139,7 +139,7 @@ node('cico-workspace') {
podman_login(ci_registry, '$CREDS_USER', '$CREDS_PASSWD') 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) podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
// cephcsi:devel is used with 'make containerized-build' // cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, ci_registry, "ceph-csi:devel") podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
@ -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}\'', 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 returnStdout: true
).trim() ).trim()
def d_io_regex = ~"^docker.io/" def q_io_regex = ~"^quay.io/"
if (rook_ceph_cluster_image != '') { if (rook_ceph_cluster_image != '') {
// single-node-k8s.sh pushes the image into minikube // 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') { timeout(time: 30, unit: 'MINUTES') {

6
mini-e2e-helm.groovy
View File

@ -141,7 +141,7 @@ node('cico-workspace') {
podman_login(ci_registry, '$CREDS_USER', '$CREDS_PASSWD') 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) podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
// cephcsi:devel is used with 'make containerized-build' // cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, ci_registry, "ceph-csi:devel") podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
@ -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}\'', 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 returnStdout: true
).trim() ).trim()
def d_io_regex = ~"^docker.io/" def q_io_regex = ~"^quay.io/"
if (rook_ceph_cluster_image != '') { if (rook_ceph_cluster_image != '') {
// single-node-k8s.sh pushes the image into minikube // 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') { timeout(time: 30, unit: 'MINUTES') {

6
mini-e2e.groovy
View File

@ -138,7 +138,7 @@ node('cico-workspace') {
podman_login(ci_registry, '$CREDS_USER', '$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/" // base_image is like quay.io/ceph/ceph:v19, strip "quay.io/"
podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex) podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
// cephcsi:devel is used with 'make containerized-build' // cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, ci_registry, "ceph-csi:devel") podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
@ -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}\'', 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 returnStdout: true
).trim() ).trim()
def d_io_regex = ~"^docker.io/" def q_io_regex = ~"^quay.io/"
if (rook_ceph_cluster_image != '') { if (rook_ceph_cluster_image != '') {
// single-node-k8s.sh pushes the image into minikube // 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') { timeout(time: 30, unit: 'MINUTES') {

10
upgrade-tests.groovy
View File

@ -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}\'', 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 returnStdout: true
).trim() ).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')]) { withCredentials([usernamePassword(credentialsId: 'container-registry-auth', usernameVariable: 'CREDS_USER', passwordVariable: 'CREDS_PASSWD')]) {
podman_login(ci_registry, '$CREDS_USER', '$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/" // base_image is like quay.io/ceph/ceph:v19, strip "quay.io/"
podman_pull(ci_registry, "docker.io", "${base_image}" - d_io_regex) podman_pull(ci_registry, "quay.io", "${base_image}" - q_io_regex)
// cephcsi:devel is used with 'make containerized-build' // cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, ci_registry, "ceph-csi:devel") podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
} }
@ -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}\'', 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 returnStdout: true
).trim() ).trim()
def d_io_regex = ~"^docker.io/" def q_io_regex = ~"^quay.io/"
if (rook_ceph_cluster_image != '') { if (rook_ceph_cluster_image != '') {
// single-node-k8s.sh pushes the image into minikube // 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') { timeout(time: 30, unit: 'MINUTES') {