Skip to content

Commit 40a1c34

Browse files
authored
QE: Fix the devcontainer for testing (#9448)
1 parent 303f706 commit 40a1c34

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

.devcontainer/test/Dockerfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
FROM registry.opensuse.org/opensuse/leap:15.5
1+
FROM registry.opensuse.org/opensuse/leap:15.5
22
RUN zypper ref -f && \
33
zypper -n ar --no-gpgcheck http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.5/ tools && \
4+
zypper -n ar --no-gpgcheck http://download.opensuse.org/repositories/devel:/languages:/ruby/15.5/ ruby && \
5+
zypper -n ar --no-gpgcheck http://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/15.5/ ruby_extensions && \
46
zypper -n install nmap tar gzip iputils \
57
gcc \
68
make \
79
wget \
810
git \
911
curl \
10-
ruby \
11-
ruby-devel \
12+
libssh-devel \
13+
python-devel \
14+
ruby3.3 \
15+
ruby3.3-devel \
1216
autoconf \
1317
ca-certificates-mozilla \
1418
automake \
@@ -21,7 +25,6 @@ RUN zypper ref -f && \
2125
libxslt-devel \
2226
mozilla-nss-tools \
2327
postgresql14-devel \
24-
ruby2.5-rubygem-bundler \
2528
twopence \
2629
python-twopence \
2730
twopence-devel \
@@ -41,8 +44,10 @@ COPY etc_pam.d_sshd /etc/pam.d/sshd
4144
RUN mkdir /root/.ssh
4245
COPY id_rsa_test_env /root/.ssh/id_rsa
4346
CMD ssh-keygen -A && /usr/sbin/sshd -De
44-
RUN curl https://raw.githubusercontent.com/uyuni-project/uyuni/master/testsuite/Gemfile -o Gemfile && bundle.ruby3.3 install && rm Gemfile
45-
RUN mkdir -p /root/.pki/nssdb && \
46-
certutil -d /root/.pki/nssdb -N
47+
RUN wget http://raw.githubusercontent.com/uyuni-project/uyuni/master/testsuite/Gemfile
48+
RUN bundle.ruby3.3 install
49+
RUN rm Gemfile
50+
RUN mkdir -p /root/.pki/nssdb
51+
RUN certutil -d /root/.pki/nssdb -N
4752
COPY bashrc /root/.bashrc
4853
RUN source /root/.bashrc

.devcontainer/test/bashrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export SERVER="oscar-srv.mgr.suse.de"
1+
export SERVER="uyuni-master-server.mgr.suse.de"
22

33
#### Generate certificates for Google Chrome
44
if [ ! -f /etc/pki/trust/anchors/$SERVER.cert ]; then

.devcontainer/test/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
},
66
// Edit these variables to match your environment
77
"remoteEnv": {
8-
"SERVER": "<user>-srv.mgr.suse.de",
9-
"PROXY": "<user>-pxy.mgr.suse.de",
10-
"MINION": "<user>-min-sles.mgr.suse.de",
8+
"SERVER": "uyuni-master-server.mgr.suse.de",
9+
"PROXY": "uyuni-master-proxy.mgr.suse.de",
10+
"MINION": "uyuni-master-suse-minion.mgr.suse.de",
1111
"GITPROFILES": "https://github.com/uyuni-project/uyuni.git#:testsuite/features/profiles/internal_nue",
1212
"AUTH_REGISTRY_CREDENTIALS": "cucutest|cucusecret",
1313
"AUTH_REGISTRY": "registry.mgr.suse.de:5000/cucutest",

0 commit comments

Comments
 (0)