[libvirt PATCH 4/5] ci: Update build system integration

Daniel P. Berrangé berrange at redhat.com
Tue Jun 2 10:36:03 UTC 2020


On Fri, May 29, 2020 at 03:00:43PM +0200, Andrea Bolognani wrote:
> The ci-* targets need to know where our container images are stored
> and how they are called to work, so now that we use the GitLab
> container registry instead of Quay some changes are necessary.
> 
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
>  ci/Makefile       | 16 ++++++++++++----
>  ci/list-images.sh | 24 ++++++------------------
>  2 files changed, 18 insertions(+), 22 deletions(-)
> 
> diff --git a/ci/Makefile b/ci/Makefile
> index bc1dac11e3..e1a5faaba6 100644
> --- a/ci/Makefile
> +++ b/ci/Makefile
> @@ -47,10 +47,13 @@ CI_PREPARE_SCRIPT = $(CI_ROOTDIR)/prepare.sh
>  # Script containing build instructions
>  CI_BUILD_SCRIPT = $(CI_ROOTDIR)/build.sh
>  
> +# Registry where container images are stored
> +CI_IMAGE_REGISTRY = registry.gitlab.com
> +
>  # Location of the container images we're going to pull
>  # Can be useful to overridde to use a locally built
>  # image instead
> -CI_IMAGE_PREFIX = quay.io/libvirt/buildenv-libvirt-
> +CI_IMAGE_PREFIX = libvirt/libvirt/ci-
>  
>  # The default tag is ':latest' but if the container
>  # repo above uses different conventions this can override it
> @@ -213,7 +216,12 @@ ci-prepare-tree: ci-check-engine
>  	fi
>  
>  ci-run-command@%: ci-prepare-tree
> -	$(CI_ENGINE) run $(CI_ENGINE_ARGS) $(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG) \
> +	image=; \
> +	if test "$(CI_IMAGE_REGISTRY)"; then \

What condition is this expected to be testing ?

> +		image="$${image}$(CI_IMAGE_REGISTRY)/"; \
> +	fi; \
> +	image="$${image}$(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG)"; \
> +	$(CI_ENGINE) run $(CI_ENGINE_ARGS) "$$image" \
>  		/bin/bash -c ' \
>  		$(CI_USER_HOME)/prepare || exit 1; \
>  		sudo \

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|




More information about the libvir-list mailing list