mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-04-08 08:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: pull images from local registry directly

Browse Source 
The mirror option of the Docker Registry container is very limited and
prevents updating or manually pushing images to the registry. Instead,
it tries to push the images to the docker.io, which is not what we need.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-11-26 17:04:01 +01:00 committed by mergify[bot]
parent 005d201f2f
commit 468b6cd67d
4 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
containerized-tests.groovy
View File

@ -19,11 +19,15 @@ def ssh(cmd) {
def podman_login(registry, username, passwd) { def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}" ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
ssh 'cp container-registry.conf /etc/containers/registries.conf'
} }
def podman_pull(registry, image) { // podman_pull pulls image from the source (CI internal) registry, and tags it
ssh "podman pull --authfile=~/.podman-auth.json ${registry}/${image} && podman tag ${registry}/${image} ${image}" // as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
//
// Images need to be pre-pushed into the source registry, though.
def podman_pull(source, destination, image) {
ssh "podman pull --authfile=~/.podman-auth.json ${source}/${image} && podman tag ${source}/${image} ${image} ${destination}/${image}"
} }
node('cico-workspace') { node('cico-workspace') {
@ -75,7 +79,7 @@ node('cico-workspace') {
try { try {
stage('prepare bare-metal machine') { stage('prepare bare-metal machine') {
sh 'scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ./prepare.sh container-registry.conf root@${CICO_NODE}:' sh 'scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ./prepare.sh root@${CICO_NODE}:'
// TODO: already checked out the PR on the node, scp the contents? // TODO: already checked out the PR on the node, scp the contents?
ssh "./prepare.sh --workdir=${workdir} --gitrepo=${git_repo} --ref=${ref}" ssh "./prepare.sh --workdir=${workdir} --gitrepo=${git_repo} --ref=${ref}"
} }
@ -107,7 +111,7 @@ node('cico-workspace') {
return return
} }
podman_pull(ci_registry, "${cached_image}:test") podman_pull(ci_registry, ci_registry, "${cached_image}:test")
} }
}, },
devel: { devel: {
@ -118,7 +122,7 @@ node('cico-workspace') {
return return
} }
podman_pull(ci_registry, "${cached_image}:devel") podman_pull(ci_registry, ci_registry, "${cached_image}:devel")
} }
}, },
ceph: { ceph: {
@ -129,24 +133,24 @@ node('cico-workspace') {
).trim() ).trim()
// base_image is like ceph/ceph:v15 // base_image is like ceph/ceph:v15
podman_pull("docker.io", "${base_image}") podman_pull(ci_registry, "docker.io", "${base_image}")
} }
} }
} }
stage('test & build') { stage('test & build') {
parallel test: { parallel test: {
node ('cico-workspace') { node ('cico-workspace') {
ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-test CONTAINER_CMD=podman ENV_CSI_IMAGE_NAME=${cached_image} ${use_test_image}" ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-test CONTAINER_CMD=podman ENV_CSI_IMAGE_NAME=${ci_registry}/${cached_image} ${use_test_image}"
} }
}, },
verify: { verify: {
node ('cico-workspace') { node ('cico-workspace') {
ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-test TARGET=mod-check CONTAINER_CMD=podman ENV_CSI_IMAGE_NAME=${cached_image} ${use_test_image}" ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-test TARGET=mod-check CONTAINER_CMD=podman ENV_CSI_IMAGE_NAME=${ci_registry}/${cached_image} ${use_test_image}"
} }
}, },
build: { build: {
node('cico-workspace') { node('cico-workspace') {
ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-build CONTAINER_CMD=podman ENV_CSI_IMAGE_NAME=${cached_image} ${use_build_image}" ssh "cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-build CONTAINER_CMD=podman ENV_CSI_IMAGE_NAME=${ci_registry}/${cached_image} ${use_build_image}"
} }
} }
} }

22
mini-e2e-helm.groovy
View File

@ -19,11 +19,15 @@ def ssh(cmd) {
def podman_login(registry, username, passwd) { def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}" ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
ssh 'cp container-registry.conf /etc/containers/registries.conf'
} }
def podman_pull(registry, image) { // podman_pull pulls image from the source (CI internal) registry, and tags it
ssh "podman pull --authfile=~/.podman-auth.json ${registry}/${image} && podman tag ${registry}/${image} ${image}" // as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
//
// Images need to be pre-pushed into the source registry, though.
def podman_pull(source, destination, image) {
ssh "podman pull --authfile=~/.podman-auth.json ${source}/${image} && podman tag ${source}/${image} ${image} ${destination}/${image}"
} }
node('cico-workspace') { node('cico-workspace') {
@ -104,7 +108,7 @@ node('cico-workspace') {
if (params.ghprbPullId != null) { if (params.ghprbPullId != null) {
ref = "pull/${ghprbPullId}/merge" ref = "pull/${ghprbPullId}/merge"
} }
sh 'scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ./prepare.sh ./single-node-k8s.sh ./podman2minikube.sh container-registry.conf root@${CICO_NODE}:' sh 'scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ./prepare.sh ./single-node-k8s.sh ./podman2minikube.sh root@${CICO_NODE}:'
ssh "./prepare.sh --workdir=/opt/build/go/src/github.com/ceph/ceph-csi --gitrepo=${git_repo} --ref=${ref}" ssh "./prepare.sh --workdir=/opt/build/go/src/github.com/ceph/ceph-csi --gitrepo=${git_repo} --ref=${ref}"
} }
stage('pull base container images') { stage('pull base container images') {
@ -118,9 +122,9 @@ node('cico-workspace') {
} }
// base_image is like ceph/ceph:v15 // base_image is like ceph/ceph:v15
podman_pull("docker.io", "${base_image}") podman_pull(ci_registry, "docker.io", "${base_image}")
// cephcsi:devel is used with 'make containerized-build' // cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, "ceph-csi:devel") podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
} }
stage('build artifacts') { stage('build artifacts') {
// build container image // build container image
@ -136,7 +140,7 @@ node('cico-workspace') {
if (rook_version != '') { if (rook_version != '') {
// single-node-k8s.sh pushes the image into minikube // single-node-k8s.sh pushes the image into minikube
podman_pull("docker.io", "rook/ceph:${rook_version}") podman_pull(ci_registry, "docker.io", "rook/ceph:${rook_version}")
} }
timeout(time: 30, unit: 'MINUTES') { timeout(time: 30, unit: 'MINUTES') {
@ -144,9 +148,9 @@ node('cico-workspace') {
} }
// vault:latest and nginx:latest are used by the e2e tests // vault:latest and nginx:latest are used by the e2e tests
podman_pull("docker.io", "library/vault:latest") podman_pull(ci_registry, "docker.io", "library/vault:latest")
ssh "./podman2minikube.sh docker.io/library/vault:latest" ssh "./podman2minikube.sh docker.io/library/vault:latest"
podman_pull("docker.io", "library/nginx:latest") podman_pull(ci_registry, "docker.io", "library/nginx:latest")
ssh "./podman2minikube.sh docker.io/library/nginx:latest" ssh "./podman2minikube.sh docker.io/library/nginx:latest"
} }
stage('deploy ceph-csi through helm') { stage('deploy ceph-csi through helm') {

22
mini-e2e.groovy
View File

@ -16,11 +16,15 @@ def ssh(cmd) {
def podman_login(registry, username, passwd) { def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}" ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
ssh 'cp container-registry.conf /etc/containers/registries.conf'
} }
def podman_pull(registry, image) { // podman_pull pulls image from the source (CI internal) registry, and tags it
ssh "podman pull --authfile=~/.podman-auth.json ${registry}/${image} && podman tag ${registry}/${image} ${image}" // as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
//
// Images need to be pre-pushed into the source registry, though.
def podman_pull(source, destination, image) {
ssh "podman pull --authfile=~/.podman-auth.json ${source}/${image} && podman tag ${source}/${image} ${image} ${destination}/${image}"
} }
node('cico-workspace') { node('cico-workspace') {
@ -101,7 +105,7 @@ node('cico-workspace') {
if (params.ghprbPullId != null) { if (params.ghprbPullId != null) {
ref = "pull/${ghprbPullId}/merge" ref = "pull/${ghprbPullId}/merge"
} }
sh 'scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ./prepare.sh ./single-node-k8s.sh ./podman2minikube.sh container-registry.conf root@${CICO_NODE}:' sh 'scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ./prepare.sh ./single-node-k8s.sh ./podman2minikube.sh root@${CICO_NODE}:'
ssh "./prepare.sh --workdir=/opt/build/go/src/github.com/ceph/ceph-csi --gitrepo=${git_repo} --ref=${ref}" ssh "./prepare.sh --workdir=/opt/build/go/src/github.com/ceph/ceph-csi --gitrepo=${git_repo} --ref=${ref}"
} }
stage('pull base container images') { stage('pull base container images') {
@ -115,9 +119,9 @@ node('cico-workspace') {
} }
// base_image is like ceph/ceph:v15 // base_image is like ceph/ceph:v15
podman_pull("docker.io", "${base_image}") podman_pull(ci_registry, "docker.io", "${base_image}")
// cephcsi:devel is used with 'make containerized-build' // cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, "ceph-csi:devel") podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
} }
stage('build artifacts') { stage('build artifacts') {
// build container image // build container image
@ -133,7 +137,7 @@ node('cico-workspace') {
if (rook_version != '') { if (rook_version != '') {
// single-node-k8s.sh pushes the image into minikube // single-node-k8s.sh pushes the image into minikube
podman_pull("docker.io", "rook/ceph:${rook_version}") podman_pull(ci_registry, "docker.io", "rook/ceph:${rook_version}")
} }
timeout(time: 30, unit: 'MINUTES') { timeout(time: 30, unit: 'MINUTES') {
@ -141,9 +145,9 @@ node('cico-workspace') {
} }
// vault:latest and nginx:latest are used by the e2e tests // vault:latest and nginx:latest are used by the e2e tests
podman_pull("docker.io", "library/vault:latest") podman_pull(ci_registry, "docker.io", "library/vault:latest")
ssh "./podman2minikube.sh docker.io/library/vault:latest" ssh "./podman2minikube.sh docker.io/library/vault:latest"
podman_pull("docker.io", "library/nginx:latest") podman_pull(ci_registry, "docker.io", "library/nginx:latest")
ssh "./podman2minikube.sh docker.io/library/nginx:latest" ssh "./podman2minikube.sh docker.io/library/nginx:latest"
} }
stage('run e2e') { stage('run e2e') {

22
upgrade-tests.groovy
View File

@ -16,11 +16,15 @@ def ssh(cmd) {
def podman_login(registry, username, passwd) { def podman_login(registry, username, passwd) {
ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}" ssh "podman login --authfile=~/.podman-auth.json --username=${username} --password='${passwd}' ${registry}"
ssh 'cp container-registry.conf /etc/containers/registries.conf'
} }
def podman_pull(registry, image) { // podman_pull pulls image from the source (CI internal) registry, and tags it
ssh "podman pull --authfile=~/.podman-auth.json ${registry}/${image} && podman tag ${registry}/${image} ${image}" // as unqualified image name and into the destination registry. This prevents
// pulling from the destination registry.
//
// Images need to be pre-pushed into the source registry, though.
def podman_pull(source, destination, image) {
ssh "podman pull --authfile=~/.podman-auth.json ${source}/${image} && podman tag ${source}/${image} ${image} ${destination}/${image}"
} }
node('cico-workspace') { node('cico-workspace') {
@ -101,7 +105,7 @@ node('cico-workspace') {
if (params.ghprbPullId != null) { if (params.ghprbPullId != null) {
ref = "pull/${ghprbPullId}/merge" ref = "pull/${ghprbPullId}/merge"
} }
sh 'scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ./prepare.sh ./single-node-k8s.sh ./podman2minikube.sh container-registry.conf root@${CICO_NODE}:' sh 'scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ./prepare.sh ./single-node-k8s.sh ./podman2minikube.sh root@${CICO_NODE}:'
ssh "./prepare.sh --workdir=/opt/build/go/src/github.com/ceph/ceph-csi --gitrepo=${git_repo} --ref=${ref}" ssh "./prepare.sh --workdir=/opt/build/go/src/github.com/ceph/ceph-csi --gitrepo=${git_repo} --ref=${ref}"
} }
stage('pull base container images') { stage('pull base container images') {
@ -115,9 +119,9 @@ node('cico-workspace') {
} }
// base_image is like ceph/ceph:v15 // base_image is like ceph/ceph:v15
podman_pull("docker.io", "${base_image}") podman_pull(ci_registry, "docker.io", "${base_image}")
// cephcsi:devel is used with 'make containerized-build' // cephcsi:devel is used with 'make containerized-build'
podman_pull(ci_registry, "ceph-csi:devel") podman_pull(ci_registry, ci_registry, "ceph-csi:devel")
} }
stage('build artifacts') { stage('build artifacts') {
// build container image // build container image
@ -133,7 +137,7 @@ node('cico-workspace') {
if (rook_version != '') { if (rook_version != '') {
// single-node-k8s.sh pushes the image into minikube // single-node-k8s.sh pushes the image into minikube
podman_pull("docker.io", "rook/ceph:${rook_version}") podman_pull(ci_registry, "docker.io", "rook/ceph:${rook_version}")
} }
timeout(time: 30, unit: 'MINUTES') { timeout(time: 30, unit: 'MINUTES') {
@ -141,9 +145,9 @@ node('cico-workspace') {
} }
// vault:latest and nginx:latest are used by the e2e tests // vault:latest and nginx:latest are used by the e2e tests
podman_pull("docker.io", "library/vault:latest") podman_pull(ci_registry, "docker.io", "library/vault:latest")
ssh "./podman2minikube.sh docker.io/library/vault:latest" ssh "./podman2minikube.sh docker.io/library/vault:latest"
podman_pull("docker.io", "library/nginx:latest") podman_pull(ci_registry, "docker.io", "library/nginx:latest")
ssh "./podman2minikube.sh docker.io/library/nginx:latest" ssh "./podman2minikube.sh docker.io/library/nginx:latest"
} }
stage("run ${test_type} upgrade tests") { stage("run ${test_type} upgrade tests") {