Merge branch 'SUSE:main' into mariadb-migration

Author: rcmadhankumar

.github/workflows/ci.yaml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout source code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install necessary software
         run: |
           set -e
@@ -36,7 +36,7 @@ jobs:
       matrix: ${{ steps.setmatrix.outputs.matrix }}
     steps:
       - name: checkout source code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: get the current PR
         uses: 8BitJonny/gh-get-current-pr@4.0.0
         id: pr
@@ -82,7 +82,7 @@ jobs:
       image: registry.suse.com/bci/python:${{ matrix.python_version }}
     steps:
       - name: checkout source code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install tox
         run: |
           python3 --version
@@ -97,7 +97,7 @@ jobs:
     name: Build documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
@@ -109,7 +109,7 @@ jobs:
     name: Lint source code
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
@@ -127,23 +127,15 @@ jobs:
         toxenv: ${{fromJson(needs.gentestmatrix.outputs.matrix)}}
         os_version:
           - 15.7
+          - "16.0"
           - "tumbleweed"
         include:
-          - toxenv: fips
-            testing_target: ibs-released
-            os_version: 15.3
           - toxenv: fips
             testing_target: ibs-released
             os_version: 15.4
           - toxenv: repository
             testing_target: ibs-released
             os_version: 15.5
-          - toxenv: all
-            testing_target: ibs-released
-            os_version: 15.3
-          - toxenv: base
-            testing_target: ibs-released
-            os_version: 15.3
           - toxenv: all
             testing_target: ibs-released
             os_version: 15.4
@@ -162,51 +154,44 @@ jobs:
           - toxenv: metadata
             testing_target: ibs-released
             os_version: 15.5
-          - toxenv: ai
+          - toxenv: all
             testing_target: ibs-released
-            os_version: 15.6-ai
+            os_version: 15.6
+          - toxenv: base
+            testing_target: ibs-released
+            os_version: 15.6
           - toxenv: metadata
             testing_target: ibs-released
-            os_version: 15.6-ai
+            os_version: 15.6
           - toxenv: spr
             testing_target: ibs-released
-            os_version: 15.6-spr
+            os_version: 15.7-spr
           - toxenv: all
             testing_target: ibs-released
-            os_version: 15.6-spr
+            os_version: 15.7-spr
           - toxenv: metadata
             testing_target: ibs-released
-            os_version: 15.6-spr
+            os_version: 15.7-spr
           - toxenv: all
-            os_version: 15.6
+            os_version: 15.4
           - toxenv: base
-            os_version: 15.6
+            os_version: 15.4
           - toxenv: metadata
-            os_version: 15.6
-          - toxenv: node
-            os_version: 15.6
-          - toxenv: python
-            os_version: 15.6
-          - toxenv: kernel_module
-            os_version: 15.6
-          - toxenv: repository
-            os_version: 15.6
-          - toxenv: fips
-            os_version: 15.6
-          - toxenv: mariadb
-            os_version: 15.6
+            os_version: 15.4
           - toxenv: all
-            os_version: 15.3
+            os_version: 15.5
           - toxenv: base
-            os_version: 15.3
+            os_version: 15.5
           - toxenv: metadata
-            os_version: 15.3
+            os_version: 15.5
           - toxenv: all
-            os_version: 15.4
+            os_version: 15.6
           - toxenv: base
-            os_version: 15.4
+            os_version: 15.6
           - toxenv: metadata
-            os_version: 15.4
+            os_version: 15.6
+          - toxenv: fips
+            os_version: 15.6
           - toxenv: all
             os_version: "16.0"
           - toxenv: base
@@ -221,12 +206,23 @@ jobs:
             os_version: "16.0"
           - toxenv: repository
             os_version: "16.0"
+          - toxenv: all
+            os_version: "16.1"
+          - toxenv: base
+            os_version: "16.1"
+          - toxenv: minimal
+            os_version: "16.1"
+          - toxenv: metadata
+            os_version: "16.1"
+          - toxenv: base
+            testing_target: factory-totest
+            os_version: "tumbleweed"
 
     steps:
       - name: Clean up disk space to maximize available space
         run: sudo rm -rf /usr/local/*/* /usr/local/.ghcup /home/runner/.rustup /home/linuxbrew /usr/share/swift /usr/share/dotnet /opt/google/chrome /opt/microsoft/msedge /opt/ghc /opt/hostedtoolcache && sudo docker image prune --all --force
       - name: checkout source code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -245,7 +241,7 @@ jobs:
           command -v ldapwhoami
         if: ${{ matrix.toxenv == '389ds' }}
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
             path: .tox
             key: tox--${{ hashFiles('tox.ini') }}

.gitlab-ci.yml

@@ -1,3 +1,3 @@
-Instructions on how to extend test coverage is in the readme file.
+Instructions on how to extend test coverage are in the readme file.
 
 If you didn't find information you are looking for in the README, please file an issue.

CONTRIBUTING.md

@@ -38,7 +38,7 @@ How can I run the tests?
 
 1. Ensure that you have the dependencies installed
 2. Optionally set the ``BCI_DEVEL_REPO`` environment variable (see next section).
-3. Run ``tox -e build`` (this is not strictly necessary to run beforehands, but it
+3. Run ``tox -e build`` (this is not strictly necessary to run beforehand, but it
    will reduce the danger of race conditions when building containers)
 4. Run ``tox -e $language_stack -- -n auto``
 
@@ -50,9 +50,9 @@ The base container
 
 We are basing most of our tests on _the_ base container (available via the
 ``BASE_CONTAINER`` variable in :file:`bci_tester/data.py`). This container is pulled
-directly from ``registry.suse.de`` and is being build from the
-`SUSE:SLE-15-SP3:Update:CR:ToTest/sles15-image
-<https://build.suse.de/package/show/SUSE:SLE-15-SP3:Update:CR:ToTest/sles15-image>`_
+directly from ``registry.suse.de`` and is being built from the
+`SUSE:SLE-15-SP7:Update:CR:ToTest/sles15-image
+<https://build.suse.de/package/show/SUSE:SLE-15-SP7:Update:CR:ToTest/sles15-image>`_
 package.
 
 That container is automatically configured at build time to contain the
@@ -61,11 +61,11 @@ tested it). We also want to be able to test the current development state of the
 ``SLE_BCI`` repository. This can be achieved by setting the environment variable
 ``BCI_DEVEL_REPO`` to the url of the development/snapshot state. It is published
 on ``dist.nue.suse.com`` in one of the subfolders of
-http://dist.nue.suse.com/ibs/SUSE:/SLE-15-SP3:/Update:/BCI/images/repo/. Unfortunately,
+http://dist.nue.suse.com/ibs/SUSE:/SLE-15-SP7:/Update:/BCI/images/repo/. Unfortunately,
 you have to hand pick the correct folder (use the one ending with ``-Media1`` and
 for the correct arch) because the build number is put into the folder name.
 
-The ``BASE_CONTAINER`` will then be rebuild with the ``SLE_BCI`` repository
+The ``BASE_CONTAINER`` will then be rebuilt with the ``SLE_BCI`` repository
 replaced with the one from the ``BCI_DEVEL_REPO`` and all tests will thus use
 the new repository.
 
@@ -172,7 +172,7 @@ that it runs each time before a commit is created. The script exits with a
 non-zero status when the desired formatting is not applied.
 
 The :file:`pre-commit-full.sh` script in addition also checks if any container
-marker in :file:`pyproject.toml` is missing. This checks takes some time.
+marker in :file:`pyproject.toml` is missing. This check takes some time.
 
 To install the hook, execute the following commands from the top level project
 directory: