summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Toso <victortoso@redhat.com>2022-03-08 10:05:59 +0100
committerVictor Toso <victortoso@redhat.com>2022-03-08 10:05:59 +0100
commitca70daa3ef5ff2e70b26d221913e4732cc070a74 (patch)
tree1ea955a63e4026f6e248eda153556de80f1eae8b
parent3a0fef72b11e2a22cac61a93a5b5b796885ac7e7 (diff)
downloadlibosinfo-ca70daa3ef5ff2e70b26d221913e4732cc070a74.tar.gz
ci: remove centos-8 due EOL
Signed-off-by: Victor Toso <victortoso@redhat.com>
-rw-r--r--ci/containers/centos-8.Dockerfile54
-rw-r--r--ci/gitlab.yml19
-rw-r--r--ci/manifest.yml2
3 files changed, 1 insertions, 74 deletions
diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile
deleted file mode 100644
index 6d95529..0000000
--- a/ci/containers/centos-8.Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/centos:8
-
-RUN dnf update -y && \
- dnf install 'dnf-command(config-manager)' -y && \
- dnf config-manager --set-enabled -y powertools && \
- dnf install -y centos-release-advanced-virtualization && \
- dnf install -y epel-release && \
- dnf install -y \
- ca-certificates \
- ccache \
- check-devel \
- gcc \
- gettext \
- git \
- glib2-devel \
- glibc-langpack-en \
- gobject-introspection-devel \
- gtk-doc \
- hwdata \
- libsoup-devel \
- libxml2 \
- libxml2-devel \
- libxslt-devel \
- make \
- meson \
- ninja-build \
- osinfo-db-tools \
- pkgconfig \
- python3 \
- python3-lxml \
- python3-pytest \
- python3-requests \
- rpm-build \
- vala \
- wget \
- xz && \
- dnf autoremove -y && \
- dnf clean all -y && \
- 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 LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 8238c38..7110872 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -10,8 +10,7 @@
stage: containers
needs: []
services:
- - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master
- alias: docker
+ - docker:dind
before_script:
- export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
- export COMMON_TAG="$CI_REGISTRY/libosinfo/libosinfo/ci-$NAME:latest"
@@ -50,13 +49,6 @@ check-dco:
# 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
@@ -160,15 +152,6 @@ mingw64-fedora-rawhide-container:
# 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-stream-8:
extends: .native_build_job
needs:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index c5f669b..256bf83 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -8,8 +8,6 @@ gitlab:
project: libosinfo
targets:
- centos-8: x86_64
-
centos-stream-8: x86_64
centos-stream-9: x86_64