ci: Move builds from alpine-314 to alpine-315

'lcitool' dropped alpine-314

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile
deleted file mode 100644 (file)
index 1cd3fc6..0000000
--- a/ci/containers/alpine-314.Dockerfile
+++ /dev/null
@@ -1,81 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/alpine:3.14
-
-RUN apk update && \
-    apk upgrade && \
-    apk add \
-        acl-dev \
-        attr-dev \
-        audit-dev \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        ceph-dev \
-        clang \
-        curl-dev \
-        cyrus-sasl-dev \
-        diffutils \
-        eudev-dev \
-        fuse-dev \
-        gcc \
-        gettext \
-        git \
-        glib-dev \
-        gnutls-dev \
-        grep \
-        iproute2 \
-        iptables \
-        kmod \
-        libcap-ng-dev \
-        libnl3-dev \
-        libpcap-dev \
-        libpciaccess-dev \
-        libselinux-dev \
-        libssh-dev \
-        libssh2-dev \
-        libtirpc-dev \
-        libxml2-dev \
-        libxml2-utils \
-        libxslt \
-        lvm2 \
-        lvm2-dev \
-        make \
-        meson \
-        musl-dev \
-        netcf-dev \
-        nfs-utils \
-        numactl-dev \
-        open-iscsi \
-        parted-dev \
-        perl \
-        pkgconf \
-        polkit \
-        py3-docutils \
-        py3-flake8 \
-        python3 \
-        qemu-img \
-        readline-dev \
-        rpcgen \
-        samurai \
-        sed \
-        util-linux-dev \
-        wireshark-dev \
-        xen-dev \
-        yajl-dev && \
-    apk list | 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/clang && \
-    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 ea0f84778940a4b1148e3a0eaa7fe6d8723ff53d..ff7c0ba16cdaededebf5db79f4aa7610a1ec8103 100644 (file)
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -19,7 +19,7 @@
 #
 #  $ git config --local alias.push-all-ctr "push -o ci.variable=RUN_ALL_CONTAINERS=1"
 #
-# Allowing the less verbose invokation
+# Allowing the less verbose invocation
 #
 #  $ git push-all-ctr
 #

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 443c1ac29959081320b7737429633a15f799b708..e3ed4a0753e4642a0abc101393d89653fe40e494 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -31,16 +31,6 @@ x86_64-almalinux-8-clang:
     RPM: skip
 
 
-x86_64-alpine-314:
-  extends: .native_build_job
-  needs:
-    - job: x86_64-alpine-314-container
-      optional: true
-  allow_failure: false
-  variables:
-    NAME: alpine-314
-
-
 x86_64-alpine-315:
   extends: .native_build_job
   needs:
@@ -48,7 +38,6 @@ x86_64-alpine-315:
       optional: true
   allow_failure: false
   variables:
-    JOB_OPTIONAL: 1
     NAME: alpine-315
 
 

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 3835a19216eed2abc7a8b8fdad2aac9fb40733d6..fe96be32f5d7ae19e22ce5c18c1d9c9a804e1ea0 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -14,18 +14,10 @@ x86_64-almalinux-8-container:
     NAME: almalinux-8
 
 
-x86_64-alpine-314-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: alpine-314
-
-
 x86_64-alpine-315-container:
   extends: .container_job
   allow_failure: false
   variables:
-    JOB_OPTIONAL: 1
     NAME: alpine-315
 
 

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 6b8f2bc5267c2ef92e841e4772345aa889e1aadf..e9ef1b47ed72a0f13d58dafb6a9417942815b44a 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -19,12 +19,7 @@ targets:
           RPM: skip
           CC: clang
 
-  alpine-314: x86_64
-
-  alpine-315:
-    jobs:
-      - arch: x86_64
-        builds: false
+  alpine-315: x86_64
 
   alpine-edge:
     jobs: