Skip to content

Commit

Permalink
Merge pull request uyuni-project#7648 from jordimassaguerpla/update_t…
Browse files Browse the repository at this point in the history
…est_containers_to_leap_15_5_and_uyuni_2023_09_release

Testsuite: update test containers to leap 15.5
  • Loading branch information
jordimassaguerpla authored Oct 31, 2023
2 parents bc579fd + 170ba03 commit 7154451
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions testsuite/dockerfiles/controller-dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM opensuse/leap:15.4
FROM opensuse/leap:15.5
RUN zypper ref -f && \
zypper -n ar --no-gpgcheck http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.4/ tools && \
zypper -n ar --no-gpgcheck http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.5/ tools && \
zypper -n install nmap tar gzip iputils \
gcc \
make \
Expand All @@ -18,7 +18,7 @@ RUN zypper ref -f && \
zlib-devel \
libxslt-devel \
mozilla-nss-tools \
postgresql-devel \
postgresql14-devel \
ruby2.5-rubygem-bundler \
twopence \
python-twopence \
Expand All @@ -28,7 +28,7 @@ RUN zypper ref -f && \
rubygem-twopence \
chromium \
chromedriver \
npm8 \
npm \
openssh-server \
openssh-clients \
hostname \
Expand Down
2 changes: 1 addition & 1 deletion testsuite/dockerfiles/opensuse-minion/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM opensuse/leap:15.4
FROM opensuse/leap:15.5
RUN zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/images/repo/Uyuni-Server-POOL-x86_64-Media1/ Uyuni-Server-POOL-x86_64 && \
zypper -n ar --no-gpgcheck https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/systemsmanagement:Uyuni:Test-Packages:Pool.repo && \
zypper ref -f && \
Expand Down
10 changes: 5 additions & 5 deletions testsuite/dockerfiles/server-all-in-one/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM registry.suse.com/bci/bci-init:15.4
FROM registry.suse.com/bci/bci-init:15.5
# from https://raw.githubusercontent.com/rjmateus/uyuni-container/main/uyuni/Dockerfile

RUN zypper ar -G http://download.opensuse.org/update/leap/15.4/backports/ backports_update_repo
RUN zypper ar -G http://download.opensuse.org/distribution/leap/15.4/repo/oss/ os_pool_repo
RUN zypper ar -G http://download.opensuse.org/update/leap/15.4/oss/ os_update_repo
RUN zypper ar -G http://download.opensuse.org/update/leap/15.5/backports/ backports_update_repo
RUN zypper ar -G http://download.opensuse.org/distribution/leap/15.5/repo/oss/ os_pool_repo
RUN zypper ar -G http://download.opensuse.org/update/leap/15.5/oss/ os_update_repo
RUN zypper ar -G http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/images/repo/Uyuni-Server-POOL-x86_64-Media1/ server_pool_repo
RUN zypper ar -G http://download.opensuse.org/update/leap/15.4/sle/ sle_update_repo
RUN zypper ar -G http://download.opensuse.org/update/leap/15.5/sle/ sle_update_repo
RUN zypper ar -G http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/images/repo/Testing-Overlay-POOL-x86_64-Media1/ testing_overlay_devel_repo

copy setup_env.sh /root/setup_env.sh
Expand Down

0 comments on commit 7154451

Please sign in to comment.