From 6e1351b4c0392cad716520808d4eac4bcc69c855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 19 Apr 2023 10:23:57 +0100 Subject: ci: regenerated with lcitool manifest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces OpenSUSE Leap 15.3 with 15.4 Signed-off-by: Daniel P. Berrangé --- ci/buildenv/opensuse-leap-153.sh | 32 ----------------------------- ci/buildenv/opensuse-leap-154.sh | 32 +++++++++++++++++++++++++++++ ci/containers/fedora-36.Dockerfile | 4 ++-- ci/containers/fedora-37.Dockerfile | 4 ++-- ci/containers/fedora-rawhide.Dockerfile | 4 ++-- ci/containers/opensuse-leap-153.Dockerfile | 33 ------------------------------ ci/containers/opensuse-leap-154.Dockerfile | 33 ++++++++++++++++++++++++++++++ ci/gitlab.yml | 7 +++++++ ci/gitlab/build-templates.yml | 12 +++++++++++ ci/gitlab/builds.yml | 12 +++++------ ci/gitlab/containers.yml | 4 ++-- ci/gitlab/sanity-checks.yml | 6 ++++-- ci/manifest.yml | 2 +- 13 files changed, 103 insertions(+), 82 deletions(-) delete mode 100644 ci/buildenv/opensuse-leap-153.sh create mode 100644 ci/buildenv/opensuse-leap-154.sh delete mode 100644 ci/containers/opensuse-leap-153.Dockerfile create mode 100644 ci/containers/opensuse-leap-154.Dockerfile diff --git a/ci/buildenv/opensuse-leap-153.sh b/ci/buildenv/opensuse-leap-153.sh deleted file mode 100644 index 5be5468..0000000 --- a/ci/buildenv/opensuse-leap-153.sh +++ /dev/null @@ -1,32 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - zypper update -y - zypper install -y \ - ca-certificates \ - ccache \ - gcc \ - git \ - glibc-locale \ - libvirt-devel \ - pkgconfig \ - python3-base \ - python3-devel \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-setuptools \ - rpm-build - rpm -qa | sort > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export PYTHON="/usr/bin/python3" diff --git a/ci/buildenv/opensuse-leap-154.sh b/ci/buildenv/opensuse-leap-154.sh new file mode 100644 index 0000000..5be5468 --- /dev/null +++ b/ci/buildenv/opensuse-leap-154.sh @@ -0,0 +1,32 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + zypper update -y + zypper install -y \ + ca-certificates \ + ccache \ + gcc \ + git \ + glibc-locale \ + libvirt-devel \ + pkgconfig \ + python3-base \ + python3-devel \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-setuptools \ + rpm-build + rpm -qa | sort > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export PYTHON="/usr/bin/python3" diff --git a/ci/containers/fedora-36.Dockerfile b/ci/containers/fedora-36.Dockerfile index 6764152..f490d98 100644 --- a/ci/containers/fedora-36.Dockerfile +++ b/ci/containers/fedora-36.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:36 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-37.Dockerfile b/ci/containers/fedora-37.Dockerfile index fa91002..863c6e8 100644 --- a/ci/containers/fedora-37.Dockerfile +++ b/ci/containers/fedora-37.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index c07e9e8..18d821d 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -8,14 +8,14 @@ FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf distro-sync -y && \ nosync dnf install -y \ diff --git a/ci/containers/opensuse-leap-153.Dockerfile b/ci/containers/opensuse-leap-153.Dockerfile deleted file mode 100644 index e399517..0000000 --- a/ci/containers/opensuse-leap-153.Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.opensuse.org/opensuse/leap:15.3 - -RUN zypper update -y && \ - zypper install -y \ - ca-certificates \ - ccache \ - gcc \ - git \ - glibc-locale \ - libvirt-devel \ - pkgconfig \ - python3-base \ - python3-devel \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-setuptools \ - rpm-build && \ - zypper clean --all && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" diff --git a/ci/containers/opensuse-leap-154.Dockerfile b/ci/containers/opensuse-leap-154.Dockerfile new file mode 100644 index 0000000..2a67aab --- /dev/null +++ b/ci/containers/opensuse-leap-154.Dockerfile @@ -0,0 +1,33 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.opensuse.org/opensuse/leap:15.4 + +RUN zypper update -y && \ + zypper install -y \ + ca-certificates \ + ccache \ + gcc \ + git \ + glibc-locale \ + libvirt-devel \ + pkgconfig \ + python3-base \ + python3-devel \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-setuptools \ + rpm-build && \ + zypper clean --all && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV PYTHON "/usr/bin/python3" diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 3866dcf..7bb68b8 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -14,6 +14,12 @@ # created/updated. Setting this variable to a non-empty # value allows CI testing prior to opening a merge request. # +# - RUN_PIPELINE_UPSTREAM_ENV - same semantics as RUN_PIPELINE, +# but uses the CI environment (containers) from the upstream project +# rather than creating and updating a throwaway environment +# Should not be used if the pushed branch includes CI container +# changes. +# # - RUN_CONTAINER_BUILDS - CI pipelines in upstream only # publish containers if CI file changes are detected. # Setting this variable to a non-empty value will force @@ -44,6 +50,7 @@ variables: RUN_UPSTREAM_NAMESPACE: libvirt + FF_SCRIPT_SECTIONS: 1 workflow: diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 4ce0706..c3da124 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -37,6 +37,13 @@ - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' when: on_success + # forks: pushes to a branch when a pipeline run in upstream env is explicitly requested + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV' + when: on_success + # upstream: other web/api/scheduled pipelines targeting the default branch - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual @@ -75,6 +82,11 @@ - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH' when: on_success + # forks: avoid build in local env when job requests run in upstream containers + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV' + when: never + + # forks: pushes to branches with pipeline requested - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL' when: manual allow_failure: true diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 7ece7b8..4e89861 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -193,23 +193,23 @@ x86_64-fedora-rawhide-local-env: NAME: fedora-rawhide -x86_64-opensuse-leap-153-prebuilt-env: +x86_64-opensuse-leap-154-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-opensuse-leap-153-container + - job: x86_64-opensuse-leap-154-container optional: true allow_failure: false variables: - NAME: opensuse-leap-153 + NAME: opensuse-leap-154 RPM: skip -x86_64-opensuse-leap-153-local-env: +x86_64-opensuse-leap-154-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: registry.opensuse.org/opensuse/leap:15.3 - NAME: opensuse-leap-153 + IMAGE: registry.opensuse.org/opensuse/leap:15.4 + NAME: opensuse-leap-154 RPM: skip diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 1d0ed09..d185c3a 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -56,11 +56,11 @@ x86_64-fedora-rawhide-container: NAME: fedora-rawhide -x86_64-opensuse-leap-153-container: +x86_64-opensuse-leap-154-container: extends: .container_job allow_failure: false variables: - NAME: opensuse-leap-153 + NAME: opensuse-leap-154 x86_64-opensuse-tumbleweed-container: diff --git a/ci/gitlab/sanity-checks.yml b/ci/gitlab/sanity-checks.yml index cdcfb9b..d2b1768 100644 --- a/ci/gitlab/sanity-checks.yml +++ b/ci/gitlab/sanity-checks.yml @@ -8,7 +8,7 @@ check-dco: stage: sanity_checks needs: [] - image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master + image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:latest interruptible: true script: - /check-dco "$RUN_UPSTREAM_NAMESPACE" @@ -17,9 +17,11 @@ check-dco: - if: '$CI_PIPELINE_SOURCE =~ "merge_request_event"' when: on_success - # forks: pushes to branches with pipeline requested + # forks: pushes to branches with pipeline requested (including upstream env pipelines) - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE' when: on_success + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV' + when: on_success # upstream+forks: that's all folks - when: never diff --git a/ci/manifest.yml b/ci/manifest.yml index dd1cfd2..2b38074 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -60,7 +60,7 @@ targets: fedora-rawhide: x86_64 - opensuse-leap-153: + opensuse-leap-154: jobs: - arch: x86_64 variables: -- cgit v1.2.1