aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamilla Conte <cconte@redhat.com>2023-05-22 18:41:52 +0100
committerRichard Henderson <richard.henderson@linaro.org>2023-05-24 12:26:40 -0700
commitb105ce60ca8bdee3e4ee928ad6a298db539dba68 (patch)
treee552507b1b4487514b78ee7cb31ba98e69ca2990
parent5f63a67adb58478974b91f5e5c2b1222b5c7f2cc (diff)
downloadqemu-b105ce60ca8bdee3e4ee928ad6a298db539dba68.zip
qemu-b105ce60ca8bdee3e4ee928ad6a298db539dba68.tar.gz
qemu-b105ce60ca8bdee3e4ee928ad6a298db539dba68.tar.bz2
Add loop over docker info
Wait for docker info to return successfuly to ensure that the docker server (daemon) started. This is needed for jobs running on Kubernetes. See https://wiki.qemu.org/Testing/CI/KubernetesRunners. Signed-off-by: Camilla Conte <cconte@redhat.com> Message-Id: <20230522174153.46801-4-cconte@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r--.gitlab-ci.d/container-template.yml2
-rw-r--r--.gitlab-ci.d/opensbi.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml
index 11569dd..9ac4a0e 100644
--- a/.gitlab-ci.d/container-template.yml
+++ b/.gitlab-ci.d/container-template.yml
@@ -8,8 +8,8 @@
- export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
- export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest"
- apk add python3
- - docker info
- docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+ - until docker info; do sleep 1; done
script:
- echo "TAG:$TAG"
- echo "COMMON_TAG:$COMMON_TAG"
diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
index 1307057..2e9d517 100644
--- a/.gitlab-ci.d/opensbi.yml
+++ b/.gitlab-ci.d/opensbi.yml
@@ -50,6 +50,7 @@ docker-opensbi:
IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - until docker info; do sleep 1; done
script:
- docker pull $IMAGE_TAG || true
- docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA