Commit efdb7c54 authored by Jordan Petridis's avatar Jordan Petridis 🌱 Committed by GStreamer Merge Bot

citemplate: slightly improve logging of docker build jobs

Part-of: <gstreamer/gst-ci!318>
parent dbc4ca1b
...@@ -116,9 +116,11 @@ variables: ...@@ -116,9 +116,11 @@ variables:
if [ -s upstream_sha ] if [ -s upstream_sha ]
then then
echo "Checking if $LOCAL_IMAGE is up to date"
# ensure we use the same image from upstream # ensure we use the same image from upstream
diff upstream_sha local_sha && exit 0 || true diff upstream_sha local_sha && exit 0 || true
echo "Copying image from gstreamer/gst-ci to local registry"
# copy the original image into the current project registry namespace # copy the original image into the current project registry namespace
# we do 2 attempts with skopeo copy at most # we do 2 attempts with skopeo copy at most
skopeo copy --dest-creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD \ skopeo copy --dest-creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD \
...@@ -131,13 +133,16 @@ variables: ...@@ -131,13 +133,16 @@ variables:
exit 0 exit 0
fi fi
set +x
# if the local ci fork repo has an image, ensure we use the same # if the local ci fork repo has an image, ensure we use the same
if [ -s local_gst_ci_sha ] if [ -s local_gst_ci_sha ]
then then
echo "Checking if $LOCAL_GST_CI_IMAGE is up to date"
# ensure we use the same image from upstream # ensure we use the same image from upstream
diff local_gst_ci_sha local_sha && exit 0 || true diff local_gst_ci_sha local_sha && exit 0 || true
echo "Copying image from $CI_PROJECT_NAMESPACE/gst-ci to local registry"
# copy the original image into the current project registry namespace # copy the original image into the current project registry namespace
# we do 2 attempts with skopeo copy at most # we do 2 attempts with skopeo copy at most
skopeo copy --dest-creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD \ skopeo copy --dest-creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD \
...@@ -153,11 +158,11 @@ variables: ...@@ -153,11 +158,11 @@ variables:
# if we have a local image but none in the upstream repo, use our # if we have a local image but none in the upstream repo, use our
if [ -s local_sha ] if [ -s local_sha ]
then then
echo "Using $LOCAL_IMAGE"
exit 0 exit 0
fi fi
fi fi
set +x
# Build docker images from Dockerfiles # Build docker images from Dockerfiles
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment