Instead of using pre-built containers hosted on Quay, build containers as part of the GitLab CI pipeline and upload them to the GitLab container registry for later use. This will not significantly slow down builds, because containers are only rebuilt when the corresponding Dockerfile has been modified. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .gitlab-ci.yml | 255 +++++++++++++++++- ci/containers/README.rst | 14 + ci/containers/libvirt-centos-7.Dockerfile | 137 ++++++++++ ci/containers/libvirt-centos-8.Dockerfile | 108 ++++++++ .../libvirt-centos-stream.Dockerfile | 109 ++++++++ ...libvirt-debian-10-cross-aarch64.Dockerfile | 122 +++++++++ .../libvirt-debian-10-cross-armv6l.Dockerfile | 120 +++++++++ .../libvirt-debian-10-cross-armv7l.Dockerfile | 121 +++++++++ .../libvirt-debian-10-cross-i686.Dockerfile | 121 +++++++++ .../libvirt-debian-10-cross-mips.Dockerfile | 121 +++++++++ ...ibvirt-debian-10-cross-mips64el.Dockerfile | 121 +++++++++ .../libvirt-debian-10-cross-mipsel.Dockerfile | 121 +++++++++ ...libvirt-debian-10-cross-ppc64le.Dockerfile | 121 +++++++++ .../libvirt-debian-10-cross-s390x.Dockerfile | 121 +++++++++ ci/containers/libvirt-debian-10.Dockerfile | 112 ++++++++ .../libvirt-debian-9-cross-aarch64.Dockerfile | 126 +++++++++ .../libvirt-debian-9-cross-armv6l.Dockerfile | 124 +++++++++ .../libvirt-debian-9-cross-armv7l.Dockerfile | 125 +++++++++ .../libvirt-debian-9-cross-mips.Dockerfile | 125 +++++++++ ...libvirt-debian-9-cross-mips64el.Dockerfile | 125 +++++++++ .../libvirt-debian-9-cross-mipsel.Dockerfile | 125 +++++++++ .../libvirt-debian-9-cross-ppc64le.Dockerfile | 125 +++++++++ .../libvirt-debian-9-cross-s390x.Dockerfile | 125 +++++++++ ci/containers/libvirt-debian-9.Dockerfile | 116 ++++++++ ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 122 +++++++++ ...libvirt-debian-sid-cross-armv6l.Dockerfile | 120 +++++++++ ...libvirt-debian-sid-cross-armv7l.Dockerfile | 121 +++++++++ .../libvirt-debian-sid-cross-i686.Dockerfile | 121 +++++++++ .../libvirt-debian-sid-cross-mips.Dockerfile | 121 +++++++++ ...bvirt-debian-sid-cross-mips64el.Dockerfile | 121 +++++++++ ...libvirt-debian-sid-cross-mipsel.Dockerfile | 120 +++++++++ ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 121 +++++++++ .../libvirt-debian-sid-cross-s390x.Dockerfile | 121 +++++++++ ci/containers/libvirt-debian-sid.Dockerfile | 112 ++++++++ ci/containers/libvirt-fedora-31.Dockerfile | 109 ++++++++ ci/containers/libvirt-fedora-32.Dockerfile | 109 ++++++++ ...rt-fedora-rawhide-cross-mingw32.Dockerfile | 130 +++++++++ ...rt-fedora-rawhide-cross-mingw64.Dockerfile | 130 +++++++++ .../libvirt-fedora-rawhide.Dockerfile | 110 ++++++++ ci/containers/libvirt-opensuse-151.Dockerfile | 109 ++++++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 117 ++++++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 113 ++++++++ ci/containers/refresh | 41 +++ 43 files changed, 5103 insertions(+), 5 deletions(-) create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-centos-8.Dockerfile create mode 100644 ci/containers/libvirt-centos-stream.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-i686.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-mips.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-s390x.Dockerfile create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-mips.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-s390x.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-i686.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-mips.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/containers/libvirt-opensuse-151.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/containers/refresh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11e106810c..0def25ff32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ variables: stages: - sanity_checks + - containers - builds .script_variables: &script_variables | @@ -14,10 +15,43 @@ stages: # Common templates +# Containers that are necessary for the default pipeline +.container_default_job_template: &container_default_job_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt/ci-$NAME:latest" + - docker info + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + script: + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/libvirt-$NAME.Dockerfile" ci/containers + - docker push "$TAG" + after_script: + - docker logout + +# Containers that are only needed for the full pipeline +.container_extra_job_template: &container_extra_job_definition + <<: *container_default_job_definition + only: + - master + - /^ci-full-.*$/ + +# We build many containers which can be useful to debug problems but are not +# needed for the pipeline itself to complete: those sometimes fail, and when +# that happens it's mostly because of temporary issues with Debian sid. We +# don't want those failures to affect the overall pipeline status +.container_optional_job_template: &container_optional_job_definition + <<: *container_extra_job_definition + allow_failure: true + # Default native build jobs that are always run .native_build_default_job_template: &native_build_default_job_definition stage: builds - image: quay.io/libvirt/buildenv-libvirt-$NAME:latest + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest cache: paths: - ccache/ @@ -65,7 +99,7 @@ stages: # Default cross build jobs that are always run .cross_build_default_job_template: &cross_build_default_job_definition stage: builds - image: quay.io/libvirt/buildenv-libvirt-$NAME-cross-$CROSS:latest + image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest cache: paths: - ccache/ @@ -87,6 +121,212 @@ stages: - /^ci-full-.*$/ +# Native container build jobs + +x64-centos-7-container: + <<: *container_default_job_definition + variables: + NAME: centos-7 + +x64-centos-8-container: + <<: *container_default_job_definition + variables: + NAME: centos-8 + +x64-centos-stream-container: + <<: *container_extra_job_definition + variables: + NAME: centos-stream + +x64-debian-9-container: + <<: *container_extra_job_definition + variables: + NAME: debian-9 + +x64-debian-10-container: + <<: *container_default_job_definition + variables: + NAME: debian-10 + +x64-debian-sid-container: + <<: *container_extra_job_definition + variables: + NAME: debian-sid + +x64-fedora-31-container: + <<: *container_extra_job_definition + variables: + NAME: fedora-31 + +x64-fedora-32-container: + <<: *container_default_job_definition + variables: + NAME: fedora-32 + +x64-fedora-rawhide-container: + <<: *container_default_job_definition + variables: + NAME: fedora-rawhide + +x64-opensuse-151-container: + <<: *container_default_job_definition + variables: + NAME: opensuse-151 + +x64-ubuntu-1804-container: + <<: *container_extra_job_definition + variables: + NAME: ubuntu-1804 + +x64-ubuntu-2004-container: + <<: *container_default_job_definition + variables: + NAME: ubuntu-2004 + + +# Cross-build containers build jobs + +aarch64-debian-9-container: + <<: *container_optional_job_definition + variables: + NAME: debian-9-cross-aarch64 + +armv6l-debian-9-container: + <<: *container_extra_job_definition + variables: + NAME: debian-9-cross-armv6l + +armv7l-debian-9-container: + <<: *container_optional_job_definition + variables: + NAME: debian-9-cross-armv7l + +mips-debian-9-container: + <<: *container_extra_job_definition + variables: + NAME: debian-9-cross-mips + +mips64el-debian-9-container: + <<: *container_extra_job_definition + variables: + NAME: debian-9-cross-mips64el + +mipsel-debian-9-container: + <<: *container_optional_job_definition + variables: + NAME: debian-9-cross-mipsel + +ppc64le-debian-9-container: + <<: *container_optional_job_definition + variables: + NAME: debian-9-cross-ppc64le + +s390x-debian-9-container: + <<: *container_optional_job_definition + variables: + NAME: debian-9-cross-s390x + +aarch64-debian-10-container: + <<: *container_extra_job_definition + variables: + NAME: debian-10-cross-aarch64 + +armv6l-debian-10-container: + <<: *container_optional_job_definition + variables: + NAME: debian-10-cross-armv6l + +armv7-ldebian-10-container: + <<: *container_optional_job_definition + variables: + NAME: debian-10-cross-armv7l + +i686-debian-10-container: + <<: *container_optional_job_definition + variables: + NAME: debian-10-cross-i686 + +mips-debian-10-container: + <<: *container_optional_job_definition + variables: + NAME: debian-10-cross-mips + +mips64el-debian-10-container: + <<: *container_optional_job_definition + variables: + NAME: debian-10-cross-mips64el + +mipsel-debian-10-container: + <<: *container_optional_job_definition + variables: + NAME: debian-10-cross-mipsel + +ppc64le-debian-10-container: + <<: *container_extra_job_definition + variables: + NAME: debian-10-cross-ppc64le + +s390x-debian-10-container: + <<: *container_default_job_definition + variables: + NAME: debian-10-cross-s390x + +aarch64-debian-sid-container: + <<: *container_optional_job_definition + variables: + NAME: debian-sid-cross-aarch64 + +armv6l-debian-sid-container: + <<: *container_optional_job_definition + variables: + NAME: debian-sid-cross-armv6l + +armv7-ldebian-sid-container: + <<: *container_default_job_definition + variables: + NAME: debian-sid-cross-armv7l + +i686-debian-sid-container: + <<: *container_extra_job_definition + variables: + NAME: debian-sid-cross-i686 + +mips-debian-sid-container: + <<: *container_optional_job_definition + variables: + NAME: debian-sid-cross-mips + +mips64el-debian-sid-container: + <<: *container_optional_job_definition + variables: + NAME: debian-sid-cross-mips64el + +mipsel-debian-sid-container: + <<: *container_extra_job_definition + variables: + NAME: debian-sid-cross-mipsel + +ppc64le-debian-sid-container: + <<: *container_optional_job_definition + variables: + NAME: debian-sid-cross-ppc64le + +s390x-debian-sid-container: + <<: *container_optional_job_definition + variables: + NAME: debian-sid-cross-s390x + +mingw32-fedora-rawhide-container: + <<: *container_default_job_definition + variables: + NAME: fedora-rawhide-cross-mingw32 + +mingw64-fedora-rawhide-container: + <<: *container_default_job_definition + variables: + NAME: fedora-rawhide-cross-mingw64 + + # Native architecture build + test jobs x64-debian-9: @@ -114,6 +354,11 @@ x64-centos-8: variables: NAME: centos-8 +x64-centos-stream: + <<: *native_build_extra_job_definition + variables: + NAME: centos-stream + x64-fedora-31: <<: *native_build_extra_job_definition variables: @@ -229,6 +474,7 @@ mingw64-fedora-rawhide: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=webs... website: stage: builds + image: $CI_REGISTRY_IMAGE/ci-centos-8:latest before_script: - *script_variables script: @@ -239,7 +485,6 @@ website: - $MAKE -C docs install - cd .. - mv vroot/share/doc/libvirt/html/ website - image: quay.io/libvirt/buildenv-libvirt-centos-8:latest artifacts: expose_as: 'Website' name: 'website' @@ -251,6 +496,7 @@ website: codestyle: stage: builds + image: $CI_REGISTRY_IMAGE/ci-centos-8:latest before_script: - *script_variables script: @@ -258,7 +504,6 @@ codestyle: - cd build - ../autogen.sh || (cat config.log && exit 1) - $MAKE syntax-check - image: quay.io/libvirt/buildenv-libvirt-centos-8:latest # This artifact published by this job is downloaded to push to Weblate @@ -266,6 +511,7 @@ codestyle: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=potf... potfile: stage: builds + image: $CI_REGISTRY_IMAGE/ci-centos-8:latest only: - master before_script: @@ -278,7 +524,6 @@ potfile: - $MAKE -C po libvirt.pot - cd .. - cp po/libvirt.pot libvirt.pot - image: quay.io/libvirt/buildenv-libvirt-centos-8:latest artifacts: expose_as: 'Potfile' name: 'potfile' diff --git a/ci/containers/README.rst b/ci/containers/README.rst new file mode 100644 index 0000000000..530897e311 --- /dev/null +++ b/ci/containers/README.rst @@ -0,0 +1,14 @@ +CI job assets +============= + +This directory contains assets used in the automated CI jobs, most +notably the Dockerfiles used to build container images in which the +CI jobs then run. + +The ``refresh`` script is used to re-create the Dockerfiles using the +``lcitool`` command that is provided by repo +https://gitlab.com/libvirt/libvirt-ci + +The containers are built during the CI process and cached in the GitLab +container registry of the project doing the build. The cached containers +can be deleted at any time and will be correctly rebuilt. [... pretend there are generated Dockerfiles here ...] diff --git a/ci/containers/refresh b/ci/containers/refresh new file mode 100755 index 0000000000..f457f3bc23 --- /dev/null +++ b/ci/containers/refresh @@ -0,0 +1,41 @@ +#!/bin/sh + +if test -z "$1" +then + echo "syntax: $0 PATH-TO-LCITOOL" + exit 1 +fi + +LCITOOL=$1 + +if ! test -x "$LCITOOL" +then + echo "$LCITOOL is not executable" + exit 1 +fi + +HOSTS=$($LCITOOL hosts | grep -v freebsd) + +for host in $HOSTS +do + case "$host" in + libvirt-fedora-rawhide) + for cross in mingw32 mingw64 + do + $LCITOOL dockerfile $host libvirt --cross $cross >$host-cross-$cross.Dockerfile + done + ;; + libvirt-debian-*) + for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le s390x + do + if test "$host" = "libvirt-debian-9" && test "$cross" = "i686" + then + continue + fi + $LCITOOL dockerfile $host libvirt --cross $cross >$host-cross-$cross.Dockerfile + done + ;; + esac + + $LCITOOL dockerfile $host libvirt >$host.Dockerfile +done -- 2.25.4

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@redhat.com> --- ci/Makefile | 10 +++++----- ci/list-images.sh | 24 ++++++------------------ 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index bc1dac11e3..dc8012f33b 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -50,11 +50,11 @@ CI_BUILD_SCRIPT = $(CI_ROOTDIR)/build.sh # 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 = registry.gitlab.com/libvirt/libvirt/ci- -# The default tag is ':latest' but if the container +# The default tag is ':master' but if the container # repo above uses different conventions this can override it -CI_IMAGE_TAG = :latest +CI_IMAGE_TAG = :master # We delete the virtual root after completion, set # to 0 if you need to keep it around for debugging @@ -243,11 +243,11 @@ ci-list-images: @echo @echo "Available x86 container images:" @echo - @sh list-images.sh "$(CI_ENGINE)" "$(CI_IMAGE_PREFIX)" | grep -v cross + @sh list-images.sh "$(CI_IMAGE_PREFIX)" | grep -v cross @echo @echo "Available cross-compiler container images:" @echo - @sh list-images.sh "$(CI_ENGINE)" "$(CI_IMAGE_PREFIX)" | grep cross + @sh list-images.sh "$(CI_IMAGE_PREFIX)" | grep cross @echo ci-help: diff --git a/ci/list-images.sh b/ci/list-images.sh index 35efdb6982..b85b132253 100644 --- a/ci/list-images.sh +++ b/ci/list-images.sh @@ -1,26 +1,14 @@ #!/bin/sh -engine="$1" -prefix="$2" +prefix="${1##registry.gitlab.com/}" -do_podman() { - # Podman freaks out if the search term ends with a dash, which ours - # by default does, so let's strip it. The repository name is the - # second field in the output, and it already starts with the registry - podman search --limit 100 "${prefix%-}" | while read _ repo _; do - echo "$repo" - done -} +PROJECT_ID=192693 -do_docker() { - # Docker doesn't include the registry name in the output, so we have - # to add it. The repository name is the first field in the output - registry="${prefix%%/*}" - docker search --limit 100 "$prefix" | while read repo _; do - echo "$registry/$repo" - done +all_repos() { + curl -s "https://gitlab.com/api/v4/projects/$PROJECT_ID/registry/repositories?per_pag..." \ + | tr , '\n' | grep '"path":' | sed 's,"path":",,g;s,"$,,g' } -"do_$engine" | grep "^$prefix" | sed "s,^$prefix,,g" | while read repo; do +all_repos | grep "^$prefix" | sed "s,^$prefix,,g" | while read repo; do echo " $repo" done | sort -u -- 2.25.4