Update to Leap 15.6 where applicable

Related progress issue: https://progress.opensuse.org/issues/157984
b10n1k · May 13, 2024 · d1b7633 · d1b7633
1 parent c357f5c
commit d1b7633
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -16,12 +16,12 @@ pr:
               - target_project: devel:openQA
                 target_repository: openSUSE_Tumbleweed
             architectures: [ x86_64 ]
-          - name: openSUSE_Leap_15.5
+          - name: openSUSE_Leap_15.6
             paths:
-              - target_project: devel:openQA:Leap:15.5
-                target_repository: openSUSE_Leap_15.5
+              - target_project: devel:openQA:Leap:15.6
+                target_repository: openSUSE_Leap_15.6
               - target_project: devel:openQA
-                target_repository: openSUSE_Leap_15.5
+                target_repository: openSUSE_Leap_15.6
             architectures: [ x86_64 ]
           - name: SLE_15_SP6_Backports
             paths:

diff --git a/container/openqa_data/Dockerfile b/container/openqa_data/Dockerfile
@@ -1,4 +1,4 @@
-FROM opensuse/leap:15.5
+FROM opensuse/leap:15.6
 LABEL maintainer Jan Sedlak <[email protected]>, Josef Skladanka <[email protected]>, wnereiz <[email protected]>, Sergio Lindo Mansilla <[email protected]>
 LABEL version="0.3"
 

diff --git a/container/webui/Dockerfile b/container/webui/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: openqa_webui:latest opensuse/openqa-webui:latest opensuse/openqa-webui:%PKG_VERSION% opensuse/openqa-webui:%PKG_VERSION%.%RELEASE%
-FROM opensuse/leap:15.5
+FROM opensuse/leap:15.6
 
 # labelprefix=org.opensuse.openqa-webui
 LABEL org.opencontainers.image.title="openQA webui container"
@@ -12,13 +12,13 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 # endlabelprefix
 
 # hadolint ignore=DL3037
-RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.5 devel_openQA && \
-    zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.5/15.5 devel_openQA_Leap && \
+RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.6 devel_openQA && \
+    zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.6/15.6 devel_openQA_Leap && \
     zypper --gpg-auto-import-keys ref && \
     # openQA might need rubygem:sass to compile assets in this context due to
     # unknown reasons even though the package should use the precompiled
     # assets from cache.tar
-    zypper in -y ca-certificates-mozilla curl openQA-local-db apache2 hostname which w3m 'rubygem(sass)' && \
+    zypper in -y ca-certificates-mozilla curl openQA-local-db apache2 apache2-utils hostname which w3m 'rubygem(sass)' && \
     zypper clean && \
     gensslcert && \
     a2enmod headers && \

diff --git a/container/webui/Dockerfile-lb b/container/webui/Dockerfile-lb
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: openqa_webui_lb:latest opensuse/openqa-webui-lb:latest opensuse/openqa-webui-lb:%PKG_VERSION% opensuse/openqa-webui-lb:%PKG_VERSION%.%RELEASE%
-FROM opensuse/leap:15.5
+FROM opensuse/leap:15.6
 
 # labelprefix=org.opensuse.openqa-webui-lb
 LABEL org.opencontainers.image.title="openQA load-balancer webui container"
@@ -12,8 +12,8 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 # endlabelprefix
 
 # hadolint ignore=DL3037
-RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.5 devel_openQA && \
-    zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.5/15.5 devel_openQA_Leap && \
+RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.6 devel_openQA && \
+    zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.6/15.6 devel_openQA_Leap && \
     zypper --gpg-auto-import-keys ref && \
     zypper in -y openQA nginx && \
     zypper clean

diff --git a/container/worker/Dockerfile b/container/worker/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: openqa_worker:latest opensuse/openqa-worker:latest opensuse/openqa-worker:%PKG_VERSION% opensuse/openqa-worker:%PKG_VERSION%.%RELEASE%
-FROM opensuse/leap:15.5
+FROM opensuse/leap:15.6
 
 # labelprefix=org.opensuse.openqa-worker
 LABEL org.opencontainers.image.title="openQA worker container"
@@ -12,8 +12,8 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 # endlabelprefix
 
 # hadolint ignore=DL3037
-RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.5 devel_openQA && \
-    zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.5/15.5 devel_openQA_Leap && \
+RUN zypper ar -p 95 -f http://download.opensuse.org/repositories/devel:openQA/15.6 devel_openQA && \
+    zypper ar -p 90 -f http://download.opensuse.org/repositories/devel:openQA:Leap:15.6/15.6 devel_openQA_Leap && \
     zypper --gpg-auto-import-keys ref && \
     zypper in -yl ca-certificates-mozilla curl gzip rsync xz && \
     zypper in -yl openQA-worker os-autoinst-s390-deps os-autoinst-ipmi-deps && \

diff --git a/docs/Installing.asciidoc b/docs/Installing.asciidoc
@@ -60,14 +60,14 @@ container engine:
 
 [source,sh]
 ----
-podman run -p 1080:80 -p 1443:443 --rm -it registry.opensuse.org/devel/openqa/containers15.5/openqa_webui:latest
+podman run -p 1080:80 -p 1443:443 --rm -it registry.opensuse.org/devel/openqa/containers15.6/openqa_webui:latest
 ----
 
 The worker container can be pulled and started with:
 
 [source,sh]
 ----
-podman run --rm -it registry.opensuse.org/devel/openqa/containers15.5/openqa_worker:latest
+podman run --rm -it registry.opensuse.org/devel/openqa/containers15.6/openqa_worker:latest
 ----
 
 === Custom configuration for containers
@@ -86,7 +86,7 @@ podman run -p 1080:80 -p 1443:443 \
   -v ./container/webui/test-key.pem:/etc/apache2/ssl.key/server.key:z \
   -v ./container/webui/test-cert.pem:/etc/apache2/ssl.crt/ca.crt:z \
   -v ./container/webui/conf/openqa.ini:/data/conf/openqa.ini:z \
-  --rm -it registry.opensuse.org/devel/openqa/containers15.5/openqa_webui:latest
+  --rm -it registry.opensuse.org/devel/openqa/containers15.6/openqa_webui:latest
 ----
 
 
@@ -98,7 +98,7 @@ supply `workers.ini` and `client.conf`:
 podman run \
   -v ./container/worker/conf/workers.ini:/data/conf/workers.ini:z \
   -v ./container/worker/conf/client.conf:/data/conf/client.conf:z \
-  --rm -it registry.opensuse.org/devel/openqa/containers15.5/openqa_worker:latest
+  --rm -it registry.opensuse.org/devel/openqa/containers15.6/openqa_worker:latest
 ----
 
 This examples assume the working directory is an openQA checkout. To avoid doing
@@ -118,7 +118,7 @@ commands mentioned there can also be invoked within a container, e.g.:
 [source,sh]
 ----
 podman run \
-   --rm -it registry.opensuse.org/devel/openqa/containers15.5/openqa_webui:latest \
+   --rm -it registry.opensuse.org/devel/openqa/containers15.6/openqa_webui:latest \
    openqa-cli --help
 ----
 

diff --git a/tools/ci/build_cache.sh b/tools/ci/build_cache.sh
@@ -5,8 +5,8 @@
 
 set -ex
 
-sudo zypper ar -f -p 90 https://download.opensuse.org/repositories/devel:/openQA:/Leap:/15.5/15.5 openQA
-sudo zypper ar -f -p 95 http://download.opensuse.org/repositories/devel:openQA/15.5 devel
+sudo zypper ar -f -p 90 https://download.opensuse.org/repositories/devel:/openQA:/Leap:/15.6/15.6 openQA
+sudo zypper ar -f -p 95 http://download.opensuse.org/repositories/devel:openQA/15.6 devel
 tools/retry sudo zypper --gpg-auto-import-keys ref
 sudo zypper -n install --download-only $(sed -e 's/\r//' < tools/ci/ci-packages.txt)
 sudo rpm -i -f $(find /var/cache/zypp/packages/ | grep '.rpm$')

diff --git a/tools/ci/build_dependencies.sh b/tools/ci/build_dependencies.sh
@@ -17,8 +17,8 @@ listdeps() {
 
 listdeps > "$DEPS_BEFORE"
 
-sudo zypper ar --priority 91 -f https://download.opensuse.org/repositories/devel:openQA/15.5 devel_openQA
-sudo zypper ar --priority 90 -f https://download.opensuse.org/repositories/devel:/openQA:/Leap:/15.5/15.5 devel_openQA_Leap
+sudo zypper ar --priority 91 -f https://download.opensuse.org/repositories/devel:openQA/15.6 devel_openQA
+sudo zypper ar --priority 90 -f https://download.opensuse.org/repositories/devel:/openQA:/Leap:/15.6/15.6 devel_openQA_Leap
 tools/retry sudo sh -c 'zypper --gpg-auto-import-keys ref && sudo zypper --no-refresh -n install openQA-devel perl-TAP-Harness-JUnit'
 
 listdeps > "$DEPS_AFTER"

diff --git a/tools/ci/build_local_container.sh b/tools/ci/build_local_container.sh
@@ -10,8 +10,8 @@ cre="${cre:-"podman"}"
 $cre build -t localtest -f- "$thisdir" << EOF
 FROM registry.opensuse.org/devel/openqa/ci/containers/base:latest
 
-RUN sudo zypper ar -f -p 90 https://download.opensuse.org/repositories/devel:/openQA:/Leap:/15.5/15.5 openQA
-RUN sudo zypper ar -f -p 95 http://download.opensuse.org/repositories/devel:openQA/15.5 devel
+RUN sudo zypper ar -f -p 90 https://download.opensuse.org/repositories/devel:/openQA:/Leap:/15.6/15.6 openQA
+RUN sudo zypper ar -f -p 95 http://download.opensuse.org/repositories/devel:openQA/15.6 devel
 RUN sudo zypper --gpg-auto-import-keys ref
 
 RUN sudo zypper -n install $(sed -e 's/\r//' < "$thisdir/ci-packages.txt" | sort | tr -s '\n' ' ')