diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2021-09-01 18:52:06 +0100 |
---|---|---|
committer | Daniel P. Berrangé <berrange@redhat.com> | 2021-09-02 17:53:58 +0100 |
commit | d5d4676631f41700ccc0449dbfff2a407ada2a64 (patch) | |
tree | 5bbe856a144c3212e73e3a36d06508bdceb2b4de /ci | |
parent | cf3c20bb4f9a153bf85631ee27f81c6c7239b3b5 (diff) | |
download | libvirt-python-d5d4676631f41700ccc0449dbfff2a407ada2a64.tar.gz |
ci: re-generate containers/gitlab config from manifest
This uses the command "lcitool manifest ci/manifest.yml" to re-generate
all existing dockerfiles and gitlab CI config.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'ci')
-rw-r--r-- | ci/containers/centos-8.Dockerfile (renamed from ci/containers/ci-centos-8.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/centos-stream-8.Dockerfile (renamed from ci/containers/ci-centos-stream-8.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/debian-10.Dockerfile (renamed from ci/containers/ci-debian-10.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/debian-sid.Dockerfile (renamed from ci/containers/ci-debian-sid.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/fedora-33.Dockerfile (renamed from ci/containers/ci-fedora-33.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/fedora-34.Dockerfile (renamed from ci/containers/ci-fedora-34.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/fedora-rawhide.Dockerfile (renamed from ci/containers/ci-fedora-rawhide.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/opensuse-leap-152.Dockerfile (renamed from ci/containers/ci-opensuse-leap-152.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/opensuse-tumbleweed.Dockerfile (renamed from ci/containers/ci-opensuse-tumbleweed.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/ubuntu-1804.Dockerfile (renamed from ci/containers/ci-ubuntu-1804.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/containers/ubuntu-2004.Dockerfile (renamed from ci/containers/ci-ubuntu-2004.Dockerfile) | 4 | ||||
-rw-r--r-- | ci/gitlab.yml | 243 |
12 files changed, 265 insertions, 22 deletions
diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index c39425d..7971369 100644 --- a/ci/containers/ci-centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-8 libvirt+minimal,libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/centos:8 diff --git a/ci/containers/ci-centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index d3bdb3c..b16097f 100644 --- a/ci/containers/ci-centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-stream-8 libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM quay.io/centos/centos:stream8 diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index 15d15b8..dd28856 100644 --- a/ci/containers/ci-debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile debian-10 libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 075037b..a5e5b52 100644 --- a/ci/containers/ci-debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile debian-sid libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index e1fb7d3..1425d18 100644 --- a/ci/containers/ci-fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-33 libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:33 diff --git a/ci/containers/ci-fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile index 0c26d52..7e1452b 100644 --- a/ci/containers/ci-fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-34 libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:34 diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 6958591..3806117 100644 --- a/ci/containers/ci-fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-rawhide libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:rawhide diff --git a/ci/containers/ci-opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index 410806b..9218ff7 100644 --- a/ci/containers/ci-opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-leap-152 libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.opensuse.org/opensuse/leap:15.2 diff --git a/ci/containers/ci-opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 1007081..c1936c9 100644 --- a/ci/containers/ci-opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-tumbleweed libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.opensuse.org/opensuse/tumbleweed:latest diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index c3b89a1..cc07c71 100644 --- a/ci/containers/ci-ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-1804 libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/ubuntu:18.04 diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index eabba1e..950780e 100644 --- a/ci/containers/ci-ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-2004 libvirt+dist,libvirt-python +# $ lcitool manifest ci/manifest.yml # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1c5d87ecd2283614a8b0c31cead0b6d7883afd28 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/ubuntu:20.04 diff --git a/ci/gitlab.yml b/ci/gitlab.yml new file mode 100644 index 0000000..4f9b02d --- /dev/null +++ b/ci/gitlab.yml @@ -0,0 +1,243 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + + +.container_job: + image: docker:stable + stage: containers + needs: [] + services: + - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master + alias: docker + before_script: + - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt-python/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/$NAME.Dockerfile" ci/containers + - docker push "$TAG" + after_script: + - docker logout + + +.gitlab_native_build_job: + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + stage: builds + + +.gitlab_cross_build_job: + image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest + stage: builds + + +check-dco: + stage: sanity_checks + needs: [] + image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master + script: + - /check-dco libvirt + except: + variables: + - $CI_PROJECT_NAMESPACE == 'libvirt' + variables: + GIT_DEPTH: 1000 + + +# Native container jobs + +x86_64-centos-8-container: + extends: .container_job + allow_failure: false + variables: + NAME: centos-8 + + +x86_64-centos-stream-8-container: + extends: .container_job + allow_failure: false + variables: + NAME: centos-stream-8 + + +x86_64-debian-10-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-10 + + +x86_64-debian-sid-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-sid + + +x86_64-fedora-33-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-33 + + +x86_64-fedora-34-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-34 + + +x86_64-fedora-rawhide-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-rawhide + + +x86_64-opensuse-leap-152-container: + extends: .container_job + allow_failure: false + variables: + NAME: opensuse-leap-152 + + +x86_64-opensuse-tumbleweed-container: + extends: .container_job + allow_failure: false + variables: + NAME: opensuse-tumbleweed + + +x86_64-ubuntu-1804-container: + extends: .container_job + allow_failure: false + variables: + NAME: ubuntu-1804 + + +x86_64-ubuntu-2004-container: + extends: .container_job + allow_failure: false + variables: + NAME: ubuntu-2004 + + +# Native build jobs + +x86_64-centos-8: + extends: .native_build_job + needs: + - x86_64-centos-8-container + allow_failure: false + variables: + NAME: centos-8 + + +x86_64-centos-8-git: + extends: .native_git_build_job + needs: + - x86_64-centos-8-container + allow_failure: false + variables: + NAME: centos-8 + artifacts: + expire_in: 2 days + paths: + - scratch + - build + +x86_64-centos-stream-8: + extends: .native_build_job + needs: + - x86_64-centos-stream-8-container + allow_failure: false + variables: + NAME: centos-stream-8 + + +x86_64-debian-10: + extends: .native_build_job + needs: + - x86_64-debian-10-container + allow_failure: false + variables: + NAME: debian-10 + + +x86_64-debian-sid: + extends: .native_build_job + needs: + - x86_64-debian-sid-container + allow_failure: false + variables: + NAME: debian-sid + + +x86_64-fedora-33: + extends: .native_build_job + needs: + - x86_64-fedora-33-container + allow_failure: false + variables: + NAME: fedora-33 + + +x86_64-fedora-34: + extends: .native_build_job + needs: + - x86_64-fedora-34-container + allow_failure: false + variables: + NAME: fedora-34 + + +x86_64-fedora-rawhide: + extends: .native_build_job + needs: + - x86_64-fedora-rawhide-container + allow_failure: false + variables: + NAME: fedora-rawhide + + +x86_64-opensuse-leap-152: + extends: .native_build_job + needs: + - x86_64-opensuse-leap-152-container + allow_failure: false + variables: + NAME: opensuse-leap-152 + RPM: skip + + +x86_64-opensuse-tumbleweed: + extends: .native_build_job + needs: + - x86_64-opensuse-tumbleweed-container + allow_failure: false + variables: + NAME: opensuse-tumbleweed + RPM: skip + + +x86_64-ubuntu-1804: + extends: .native_build_job + needs: + - x86_64-ubuntu-1804-container + allow_failure: false + variables: + NAME: ubuntu-1804 + + +x86_64-ubuntu-2004: + extends: .native_build_job + needs: + - x86_64-ubuntu-2004-container + allow_failure: false + variables: + NAME: ubuntu-2004 |