Merge branch 'master' into one-to-many

uyuni-project · Jan 30, 2025 · 37b4046 · 37b4046
2 parents a252537 + 064627e
commit 37b4046
Show file tree

Hide file tree

Showing 682 changed files with 14,635 additions and 16,413 deletions.
diff --git a/.github/workflows/acceptance_tests_common.yml b/.github/workflows/acceptance_tests_common.yml
@@ -82,10 +82,10 @@ jobs:
         run: ./testsuite/podman_runner/06_collect_and_tag_flaky_tests_in_controller.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_GALAXY_CI }}
+      - name: setup-server-container
+        run: ./testsuite/podman_runner/07_server_setup.sh
       - name: start-server-container
-        run: ./testsuite/podman_runner/07_start_server.sh
-      - name: mgr-setup
-        run: ./testsuite/podman_runner/08_manager_setup.sh
+        run: ./testsuite/podman_runner/08_start_server.sh
       - name: build_code
         run: ./testsuite/podman_runner/09_build_server_code.sh
 #     - name: copy_ca

diff --git a/.github/workflows/build_containers.yml b/.github/workflows/build_containers.yml
@@ -38,7 +38,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             BASE=registry.opensuse.org/uyuni/server
-            VERSION=2024.08
+            VERSION=2024.12
   build-and-push-ubuntu-minion-image:
     runs-on: ubuntu-latest
     permissions:
@@ -252,3 +252,34 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+  build-and-push-fakeipmi-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-fakeipmi
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./testsuite/dockerfiles/fakeipmi/
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/client/rhel/spacewalk-client-tools/spacewalk-client-tools.changes b/client/rhel/spacewalk-client-tools/spacewalk-client-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 14:49:17 CET 2025 - [email protected]
+
+- version 5.1.2-0
+  * Show Source String change for translations
+
 -------------------------------------------------------------------
 Mon Oct 14 15:46:10 CEST 2024 - [email protected]
 

diff --git a/...l/spacewalk-client-tools/spacewalk-client-tools.changes.mcalmer.show-source-string-change b/...l/spacewalk-client-tools/spacewalk-client-tools.changes.mcalmer.show-source-string-change
diff --git a/client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec b/client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec
@@ -65,7 +65,7 @@
 %bcond_with    test
 
 Name:           spacewalk-client-tools
-Version:        5.1.1
+Version:        5.1.2
 Release:        0
 Summary:        Support programs and libraries for Spacewalk
 License:        GPL-2.0-only

diff --git a/containers/init-image/Dockerfile b/containers/init-image/Dockerfile
@@ -52,7 +52,7 @@ LABEL org.opencontainers.image.description="This image initialize users, groups
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/init:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/init-image/init-image.changes b/containers/init-image/init-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:35:22 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:31:34 CET 2024 - [email protected]
 

diff --git a/containers/proxy-helm/Chart.yaml b/containers/proxy-helm/Chart.yaml
@@ -6,4 +6,4 @@ description: Uyuni proxy containers.
 type: application
 home: https://www.uyuni-project.org/
 icon: https://www.uyuni-project.org/img/uyuni-logo.svg
-version: 5.1.2
+version: 5.1.3
diff --git a/containers/proxy-helm/proxy-helm.changes b/containers/proxy-helm/proxy-helm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:37:14 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:32:53 CET 2024 - [email protected]
 

diff --git a/containers/proxy-httpd-image/Dockerfile b/containers/proxy-httpd-image/Dockerfile
@@ -50,7 +50,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-httpd-image
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-httpd:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/proxy-httpd-image/proxy-httpd-image.changes b/containers/proxy-httpd-image/proxy-httpd-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:38:12 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:33:55 CET 2024 - [email protected]
 

diff --git a/containers/proxy-salt-broker-image/Dockerfile b/containers/proxy-salt-broker-image/Dockerfile
@@ -41,7 +41,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-salt-broker-image
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-salt-broker:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/proxy-salt-broker-image/proxy-salt-broker-image.changes b/containers/proxy-salt-broker-image/proxy-salt-broker-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:39:11 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:34:38 CET 2024 - [email protected]
 

diff --git a/containers/proxy-squid-image/Dockerfile b/containers/proxy-squid-image/Dockerfile
@@ -58,7 +58,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-squid-image
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-squid:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/proxy-squid-image/proxy-squid-image.changes b/containers/proxy-squid-image/proxy-squid-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:40:02 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Set maximal cache time for metadata to 5 minutes
+
 -------------------------------------------------------------------
 Thu Dec 12 10:35:15 CET 2024 - [email protected]
 

diff --git a/...rs/proxy-squid-image/proxy-squid-image.changes.mcalmer.api-for-pillar-refresh-all-systems b/...rs/proxy-squid-image/proxy-squid-image.changes.mcalmer.api-for-pillar-refresh-all-systems
diff --git a/containers/proxy-squid-image/squid.conf b/containers/proxy-squid-image/squid.conf
@@ -41,7 +41,7 @@ refresh_pattern /saltboot/.*$ 10080 100% 525600 ignore-no-store ignore-reload ig
 # kernel and initrd are tied to images, will never change as well
 refresh_pattern /tftp/images/.*$ 10080 100% 525600 ignore-no-store ignore-reload ignore-private
 # rest of tftp are config files prone to change frequently
-refresh_pattern /tftp/.*$ 0 1% 1440 reload-into-ims refresh-ims
+refresh_pattern /tftp/.*$ 0 1% 5 reload-into-ims refresh-ims
 refresh_pattern 	.		0	100%	525600
 
 # secure squid

diff --git a/containers/proxy-ssh-image/Dockerfile b/containers/proxy-ssh-image/Dockerfile
@@ -46,7 +46,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-ssh-image
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-ssh:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/proxy-ssh-image/proxy-ssh-image.changes b/containers/proxy-ssh-image/proxy-ssh-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:40:48 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:35:55 CET 2024 - [email protected]
 

diff --git a/containers/proxy-tftpd-image/Dockerfile b/containers/proxy-tftpd-image/Dockerfile
@@ -45,7 +45,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-tftpd-image
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-tftpd:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/proxy-tftpd-image/proxy-tftpd-image.changes b/containers/proxy-tftpd-image/proxy-tftpd-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:41:43 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:36:40 CET 2024 - [email protected]
 

diff --git a/containers/server-attestation-image/Dockerfile b/containers/server-attestation-image/Dockerfile
@@ -28,7 +28,7 @@ LABEL org.opencontainers.image.description="${PRODUCT} Confidential Computing at
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-attestation:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/server-attestation-image/server-attestation-image.changes b/containers/server-attestation-image/server-attestation-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:45:38 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:37:14 CET 2024 - [email protected]
 

diff --git a/containers/server-helm/Chart.yaml b/containers/server-helm/Chart.yaml
@@ -6,4 +6,4 @@ description: Uyuni server containers.
 type: application
 home: https://www.uyuni-project.org/
 icon: https://www.uyuni-project.org/img/uyuni-logo.svg
-version: 5.1.2
+version: 5.1.3
diff --git a/containers/server-helm/server-helm.changes b/containers/server-helm/server-helm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:46:59 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:37:52 CET 2024 - [email protected]
 

diff --git a/containers/server-hub-xmlrpc-api-image/Dockerfile b/containers/server-hub-xmlrpc-api-image/Dockerfile
@@ -20,7 +20,7 @@ LABEL org.opencontainers.image.description="${PRODUCT} Hub XML-RPC API image"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-hub-xmlrpc-api:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/server-hub-xmlrpc-api-image/server-hub-xmlrpc-api-image.changes b/containers/server-hub-xmlrpc-api-image/server-hub-xmlrpc-api-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:48:06 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:38:27 CET 2024 - [email protected]
 

diff --git a/containers/server-image/Dockerfile b/containers/server-image/Dockerfile
@@ -26,6 +26,11 @@ RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-li
     ${EXTRAPACKAGES} \
     ${PRODUCT_PATTERN_PREFIX}_server \
     ${PRODUCT_PATTERN_PREFIX}_retail \
+    spacewalk-backend-sql-postgresql \
+    spacewalk-java-postgresql \
+    postgresql16-contrib \
+    postgresql16-server \
+    postgresql16 \
     billing-data-service \
     grub2-x86_64-efi \
     grub2-arm64-efi \
@@ -74,8 +79,6 @@ RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-li
     sssd-krb5 \
     sssd-tools
 
-RUN sed -i 's/sysctl kernel.shmmax/#sysctl kernel.shmmax/g' /usr/bin/uyuni-setup-reportdb
-
 RUN mkdir -p /etc/postgres_exporter \
              /etc/prometheus-jmx_exporter/tomcat \
              /usr/lib/systemd/system/tomcat.service.d \
@@ -144,7 +147,7 @@ LABEL org.opencontainers.image.description="All-in-one ${PRODUCT} server image"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/server-image/server-image.changes b/containers/server-image/server-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:48:48 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Fix timezone alignment on container restart (bsc#1235692)
+
 -------------------------------------------------------------------
 Thu Dec 12 10:39:23 CET 2024 - [email protected]
 

diff --git a/containers/server-image/server-image.changes.cbosdo.timezone-fix b/containers/server-image/server-image.changes.cbosdo.timezone-fix
diff --git a/containers/server-migration-14-16-image/Dockerfile b/containers/server-migration-14-16-image/Dockerfile
@@ -26,7 +26,7 @@ LABEL org.opencontainers.image.description="${PRODUCT} server migration image"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
-LABEL org.opencontainers.image.version=5.1.2
+LABEL org.opencontainers.image.version=5.1.3
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-migration-14-16:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/server-migration-14-16-image/server-migration-14-16-image.changes b/containers/server-migration-14-16-image/server-migration-14-16-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:49:27 CET 2025 - [email protected]
+
+- version 5.1.3
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:40:53 CET 2024 - [email protected]
 

diff --git a/containers/server-saline-image/Dockerfile b/containers/server-saline-image/Dockerfile
@@ -40,7 +40,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=server-saline-image
-LABEL org.opencontainers.image.version=5.1.1
+LABEL org.opencontainers.image.version=5.1.2
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/salt-saline:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

diff --git a/containers/server-saline-image/server-saline-image.changes b/containers/server-saline-image/server-saline-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 24 13:43:10 CET 2025 - [email protected]
+
+- version 5.1.2
+  * Update for next release
+
 -------------------------------------------------------------------
 Thu Dec 12 10:41:45 CET 2024 - [email protected]
 

diff --git a/java/buildconf/ivy/obs-maven-config.yaml b/java/buildconf/ivy/obs-maven-config.yaml
@@ -34,7 +34,7 @@ artifacts:
     jar: cglib.jar
     repository: Leap
   - artifact: classmate
-    repository: Uyuni_Other
+    repository: Leap
   - artifact: javax.mail
     jar: javax.mail.jar
     package: javamail
@@ -84,7 +84,7 @@ artifacts:
     package: apache-commons-compress
     repository: Leap
   - artifact: concurrentlinkedhashmap-lru
-    repository: Uyuni_Other
+    repository: Leap
   - artifact: dom4j
     repository: Leap_sle
   - artifact: ehcache-core
@@ -331,19 +331,19 @@ artifacts:
   - artifact: jetty-util
     repository: Leap_sle
   - artifact: glassfish-jaxb-api
-    repository: Uyuni_Other
+    repository: Leap
   - artifact: jaxb-runtime
     package: glassfish-jaxb-runtime
-    repository: Uyuni_Other
+    repository: Leap 
   - artifact: jaxb-impl
     package: glassfish-jaxb-runtime
-    repository: Uyuni_Other
+    repository: Leap
   - artifact: txw2
     package: glassfish-jaxb-txw2
-    repository: Uyuni_Other
+    repository: Leap
   - artifact: glassfish-activation
-    repository: Uyuni_Other
+    repository: Leap
   - artifact: istack-commons-runtime
     repository: Leap
   - artifact: stax-ex
-    repository: Uyuni_Other
+    repository: Leap