ci: refresh with 'lcitool manifest'

Switch from openSUSE Leap 15.5 to 16.0. Not just CI build job,
but also codestyle_job which runs on Leap too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6de867e1f20f9b0d9a2d46f5838a4b564cb881b8..e79da0944315922e389562d4d545e1265ea07b02 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,14 +108,14 @@ codestyle_job:
   stage: sanity_checks
   extends: .gitlab_native_build_job
   needs:
-    - job: x86_64-opensuse-leap-15-container
+    - job: x86_64-opensuse-leap-16-container
       optional: true
   script:
     - source ci/jobs.sh
     - run_codestyle
   variables:
-    NAME: opensuse-leap-15
-    TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.5
+    NAME: opensuse-leap-16
+    TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:16.0
 
 # This artifact published by this job is downloaded to push to Weblate
 # for translation usage:

diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-16.sh
similarity index 88%
rename from ci/buildenv/opensuse-leap-15.sh
rename to ci/buildenv/opensuse-leap-16.sh
index 55d9fe5974d4375fb8c389c63254495f20c580d5..be9aca1aa2afe895200ab7d0fa0c1863d68c27d7 100644 (file)
--- a/ci/buildenv/opensuse-leap-15.sh
+++ b/ci/buildenv/opensuse-leap-16.sh
@@ -6,7 +6,6 @@
 
 function install_buildenv() {
     zypper update -y
-    zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo
     zypper install -y --allow-downgrade \
            audit-devel \
            augeas \
@@ -18,7 +17,6 @@ function install_buildenv() {
            clang-devel \
            codespell \
            cpp \
-           cppi \
            cyrus-sasl-devel \
            device-mapper-devel \
            diffutils \
@@ -64,19 +62,17 @@ function install_buildenv() {
            perl-base \
            pkgconfig \
            python3-base \
+           python3-black \
            python3-docutils \
            python3-flake8 \
-           python3-pip \
            python3-pytest \
-           python3-setuptools \
-           python3-wheel \
            qemu-tools \
            readline-devel \
            rpm-build \
-           sanlock-devel \
            sed \
            systemd-rpm-macros \
-           systemtap-sdt-devel \
+           systemtap-dtrace \
+           systemtap-headers \
            wireshark-devel \
            xen-devel
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
@@ -85,7 +81,6 @@ function install_buildenv() {
     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
-    /usr/bin/pip3 install black
 }
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-16.Dockerfile
similarity index 86%
rename from ci/containers/opensuse-leap-15.Dockerfile
rename to ci/containers/opensuse-leap-16.Dockerfile
index 8857f35ce0a3bac5592ea8fd7b53beacfd6b2025..7d1680f464e9c21c2f0f9f84b21b23f96473f2c9 100644 (file)
--- a/ci/containers/opensuse-leap-15.Dockerfile
+++ b/ci/containers/opensuse-leap-16.Dockerfile
@@ -4,10 +4,9 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.opensuse.org/opensuse/leap:15.6
+FROM registry.opensuse.org/opensuse/leap:16.0
 
 RUN zypper update -y && \
-    zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo && \
     zypper install -y --allow-downgrade \
            audit-devel \
            augeas \
@@ -19,7 +18,6 @@ RUN zypper update -y && \
            clang-devel \
            codespell \
            cpp \
-           cppi \
            cyrus-sasl-devel \
            device-mapper-devel \
            diffutils \
@@ -65,19 +63,17 @@ RUN zypper update -y && \
            perl-base \
            pkgconfig \
            python3-base \
+           python3-black \
            python3-docutils \
            python3-flake8 \
-           python3-pip \
            python3-pytest \
-           python3-setuptools \
-           python3-wheel \
            qemu-tools \
            readline-devel \
            rpm-build \
-           sanlock-devel \
            sed \
            systemd-rpm-macros \
-           systemtap-sdt-devel \
+           systemtap-dtrace \
+           systemtap-headers \
            wireshark-devel \
            xen-devel && \
     zypper clean --all && \
@@ -88,8 +84,6 @@ RUN zypper update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
-RUN /usr/bin/pip3 install black
-
 ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
 ENV LANG="en_US.UTF-8"
 ENV MAKE="/usr/bin/make"

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index c11c834f60b5ffe06485413ff165d82e8401e241..65bec6d0f800baf2ba4f96e0baf09f14671e39d2 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -198,17 +198,16 @@ x86_64-fedora-rawhide-clang:
     TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:rawhide
 
 
-x86_64-opensuse-leap-15:
+x86_64-opensuse-leap-16:
   extends: .native_build_job
   needs:
-    - job: x86_64-opensuse-leap-15-container
+    - job: x86_64-opensuse-leap-16-container
       optional: true
   allow_failure: false
   variables:
-    CFLAGS: -Wno-missing-include-dirs
-    NAME: opensuse-leap-15
+    NAME: opensuse-leap-16
     RPM: skip
-    TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.6
+    TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:16.0
 
 
 x86_64-opensuse-tumbleweed:

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index a4b9a5f03b851110046762906367898e80ee9447..0c62956277e88f454c5fe49c2c8093e94bf359d9 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -84,11 +84,11 @@ x86_64-fedora-rawhide-container:
     NAME: fedora-rawhide
 
 
-x86_64-opensuse-leap-15-container:
+x86_64-opensuse-leap-16-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: opensuse-leap-15
+    NAME: opensuse-leap-16
 
 
 x86_64-opensuse-tumbleweed-container:

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 67a53bb3d2c8a3c9421a058bc4ed452f51cd85f1..0bf6d937981369ccd78454473accda9301f55d97 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -161,13 +161,11 @@ targets:
         allow-failure: true
         builds: false
 
-  opensuse-leap-15:
+  opensuse-leap-16:
     jobs:
       - arch: x86_64
         variables:
           RPM: skip
-          # Keep until fix for: https://bugzilla.opensuse.org/show_bug.cgi?id=1216862
-          CFLAGS: -Wno-missing-include-dirs
 
   opensuse-tumbleweed:
     jobs: