mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-29 17:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: replace docker.io ceph image with quay.io path

Browse Source 
The ceph images are served from quay.io and this commit adjust
the docker pull to quay.io pull for centos jobs.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2022-03-30 10:57:56 +05:30 committed by mergify[bot]
parent c58b02ae52
commit b553425d85
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containerized-tests.groovy
View File

@ -137,10 +137,10 @@ 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/"
// base_image is like ceph/ceph:v15 or docker.io/ceph/ceph:v15, strip "docker.io/" // base_image is like ceph/ceph:v15 or quay.io/ceph/ceph:v15, 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)
} }
} }
} }

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

@ -117,14 +117,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 ceph/ceph:v15 or quay.io/ceph/ceph:v15, 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")
} }

6
mini-e2e-helm.groovy
View File

@ -119,14 +119,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 ceph/ceph:v15 or quay.io/ceph/ceph:v15, 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")
} }

4
mini-e2e.groovy
View File

@ -116,14 +116,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 ceph/ceph:v15 or docker.io/ceph/ceph:v15, strip "docker.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")
} }