Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Testsuite: update test containers to leap 15.5 #7648

Merged
merged 1 commit into from
Oct 31, 2023
Merged

Testsuite: update test containers to leap 15.5 #7648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions testsuite/dockerfiles/controller-dev/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why here we are using a SLE image instead openSUSE Leap. I know that the bci-init is based on tumbleweed, not on Leap, but using SLE as base and adding Leap repos sounds weird to me


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
Loading