Merge pull request #1871 from dmach/gha-bci-base-15.7

GHA: Switch to bci-base:15.7

.github/workflows/build-install.yaml

@@ -38,6 +38,9 @@ jobs:
           - 'registry.opensuse.org/opensuse/leap:15.6'
           - 'registry.opensuse.org/opensuse/tumbleweed'
 
+          # SLE
+          - 'registry.suse.com/bci/bci-base:15.7'
+
           # CentOS Stream
           - 'quay.io/centos/centos:stream9'
 
@@ -54,6 +57,16 @@ jobs:
             zypper -n dist-upgrade
             zypper -n install git-lfs rpm-build
 
+      - name: 'Install packages (SLE)'
+        if: ${{ contains(matrix.container, '/bci/bci-base') }}
+        run: |
+            zypper -n --gpg-auto-import-keys refresh
+            zypper -n lr --details
+            zypper -n dist-upgrade
+            # git-lfs package is not available in the repos, we'll include it from leap 15.6
+            zypper -n install rpm-build
+            zypper -n --no-gpg-checks install https://download.opensuse.org/distribution/leap/15.6/repo/oss/x86_64/git-lfs-3.4.0-bp156.1.14.x86_64.rpm
+
       - name: 'Install packages (Fedora/CentOS)'
         if: ${{ contains(matrix.container, '/fedora:') || contains(matrix.container, '/centos:') }}
         run: |
@@ -67,8 +80,8 @@ jobs:
         with:
             fetch-depth: 0
 
-      - name: 'Install build dependencies (OpenSUSE)'
-        if: ${{ contains(matrix.container, '/opensuse/') }}
+      - name: 'Install build dependencies (OpenSUSE/SLE)'
+        if: ${{ contains(matrix.container, '/opensuse/') || contains(matrix.container, '/bci/bci-base') }}
         run: |
             zypper --non-interactive install $(rpmspec -q --buildrequires contrib/osc.spec)
 
@@ -89,8 +102,8 @@ jobs:
 
             ./contrib/build_rpm.py --srpm --rpm
 
-      - name: 'Install built RPMs (OpenSUSE)'
-        if: ${{ contains(matrix.container, '/opensuse/') }}
+      - name: 'Install built RPMs (OpenSUSE/SLE)'
+        if: ${{ contains(matrix.container, '/opensuse/') || contains(matrix.container, '/bci/bci-base') }}
         run: |
             zypper --non-interactive install --force --allow-vendor-change --allow-unsigned-rpm ./contrib/*/*.rpm
 

.github/workflows/tests.yaml

@@ -63,6 +63,9 @@ jobs:
           - 'registry.opensuse.org/opensuse/leap:15.6'
           - 'registry.opensuse.org/opensuse/tumbleweed'
 
+          # SLE
+          - 'registry.suse.com/bci/bci-base:15.7'
+
           # CentOS Stream
           - 'quay.io/centos/centos:stream9'
 
@@ -87,6 +90,14 @@ jobs:
             zypper -n install git-lfs
             zypper -n install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-ruamel.yaml python3-setuptools python3-urllib3
 
+      - name: 'Install packages (SLE)'
+        if: contains(matrix.container, '/bci/bci-base') }}
+        run: |
+            zypper -n --gpg-auto-import-keys refresh
+            zypper -n lr --details
+            zypper -n --no-gpg-checks install https://download.opensuse.org/distribution/leap/15.6/repo/oss/x86_64/git-lfs-3.4.0-bp156.1.14.x86_64.rpm
+            zypper -n install diffstat diffutils git-core python3 python3-cryptography python3-pip python3-rpm python3-ruamel.yaml python3-setuptools python3-urllib3
+
       - name: 'Install packages (Fedora/CentOS)'
         if: ${{ contains(matrix.container, '/fedora:') || contains(matrix.container, '/centos:') }}
         run: |

behave/Containerfile

@@ -1,15 +1,13 @@
-FROM opensuse/leap:15.6
+FROM registry.suse.com/bci/bci-base:15.7
 
-RUN zypper -n modifyrepo --disable repo-openh264 || : \
-    && zypper ar --repo http://download.opensuse.org/repositories/OBS:/Server:/Unstable/15.6/OBS:Server:Unstable.repo \
-    && zypper ar --repo http://download.opensuse.org/repositories/devel:/tools:/scm/15.6/devel:tools:scm.repo \
-    && zypper ar --repo https://download.opensuse.org/repositories/devel:/Factory:/git-workflow/15.6/devel:Factory:git-workflow.repo \
+RUN zypper ar --repo http://download.opensuse.org/repositories/OBS:/Server:/Unstable/15.7/OBS:Server:Unstable.repo \
+    && zypper ar --repo http://download.opensuse.org/repositories/devel:/tools:/scm/15.7/devel:tools:scm.repo \
+    && zypper ar --repo https://download.opensuse.org/repositories/devel:/Factory:/git-workflow/15.7/devel:Factory:git-workflow.repo \
     && zypper -n --gpg-auto-import-keys refresh
 
 RUN zypper -n install \
     bash \
     bash-completion \
-    crun \
     fuse-overlayfs \
     git \
     gitea-action-runner \
@@ -29,7 +27,9 @@ RUN zypper -n install \
     sqlite3 \
     systemd \
     vim \
-    && zypper -n install --repo=devel_tools_scm gitea \
+    devel_Factory_git-workflow:gitea \
+    # gd package is not available in the repos, but required by obs-api-deps -> perl-GD; we'll include it from leap 15.6
+    https://download.opensuse.org/distribution/leap/15.6/repo/oss/x86_64/gd-2.2.5-11.3.1.x86_64.rpm \
     && rm -rf /var/cache/zypp/*
 
 COPY container-files/ /