From f3092b0448c880bb4547e1b7785bec186837dd84 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Wed, 3 May 2023 08:56:31 +0200 Subject: ci: Replace OpenSUSE Leap 15.4 target with Leap 15 name We now refer to the latest Leap 15.X simply as Leap 15 in lcitool. Signed-off-by: Erik Skultety --- ci/buildenv/opensuse-leap-15.sh | 32 +++++++++++++++++++++++++++++ ci/buildenv/opensuse-leap-154.sh | 32 ----------------------------- ci/containers/opensuse-leap-15.Dockerfile | 33 ++++++++++++++++++++++++++++++ ci/containers/opensuse-leap-154.Dockerfile | 33 ------------------------------ ci/gitlab/builds.yml | 10 ++++----- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 7 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 ci/buildenv/opensuse-leap-15.sh delete mode 100644 ci/buildenv/opensuse-leap-154.sh create mode 100644 ci/containers/opensuse-leap-15.Dockerfile delete mode 100644 ci/containers/opensuse-leap-154.Dockerfile diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh new file mode 100644 index 0000000..5be5468 --- /dev/null +++ b/ci/buildenv/opensuse-leap-15.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/buildenv/opensuse-leap-154.sh b/ci/buildenv/opensuse-leap-154.sh deleted file mode 100644 index 5be5468..0000000 --- a/ci/buildenv/opensuse-leap-154.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/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile new file mode 100644 index 0000000..2a67aab --- /dev/null +++ b/ci/containers/opensuse-leap-15.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/containers/opensuse-leap-154.Dockerfile b/ci/containers/opensuse-leap-154.Dockerfile deleted file mode 100644 index 2a67aab..0000000 --- a/ci/containers/opensuse-leap-154.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.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/builds.yml b/ci/gitlab/builds.yml index 400268a..f8bc8b7 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -195,23 +195,23 @@ x86_64-fedora-rawhide-local-env: NAME: fedora-rawhide -x86_64-opensuse-leap-154-prebuilt-env: +x86_64-opensuse-leap-15-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-opensuse-leap-154-container + - job: x86_64-opensuse-leap-15-container optional: true allow_failure: false variables: - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 RPM: skip -x86_64-opensuse-leap-154-local-env: +x86_64-opensuse-leap-15-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: IMAGE: registry.opensuse.org/opensuse/leap:15.4 - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 RPM: skip diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 44a1f13..ffa6c27 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-154-container: +x86_64-opensuse-leap-15-container: extends: .container_job allow_failure: false variables: - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 x86_64-opensuse-tumbleweed-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 7073d0d..6577b96 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -68,7 +68,7 @@ targets: - arch: x86_64 allow-failure: true - opensuse-leap-154: + opensuse-leap-15: jobs: - arch: x86_64 variables: -- cgit v1.2.1